Merge branch 'bugfix/btdm_gattc_adv_bug' into 'master'

component/bt: Fix memory leakage, connection fail bugs

- Fix memory leakage while deregisting gatt app
- Fix Android connection failed problem
- Fix service_uuid_len error in adv data

See merge request !706

diff --cc components/bt/bluedroid/include/bt_target.h
index 9a77e6c8f84e6198772c555663b31804c72ac239,21fa74ce2fa26e233b9167d76627a6cbbd2037be..02c0486a82e49b935e448ea0e0b037a51961d462
--- 1/components/bt/bluedroid/include/bt_target.h
--- 2/components/bt/bluedroid/include/bt_target.h
+++ b/components/bt/bluedroid/include/bt_target.h
@@@ -717,9 -684,10 +717,9 @@@
  #define L2CAP_CLIENT_INCLUDED FALSE
  #endif
  
 -
  /* The maximum number of simultaneous links that L2CAP can support. Up to 7*/
  #ifndef MAX_ACL_CONNECTIONS
- #define MAX_L2CAP_LINKS             3
+ #define MAX_L2CAP_LINKS             5
  #else
  #define MAX_L2CAP_LINKS             MAX_ACL_CONNECTIONS
  #endif

diff --cc components/bt/bluedroid/stack/btm/btm_acl.c
Simple merge

diff --cc components/bt/bluedroid/stack/gatt/gatt_utils.c
Simple merge