am bc6ad53e: Merge "Improve adv_data transfer between contexts."

* commit 'bc6ad53e310c2b6b1734883e8d92f5c147279d23':
  Improve adv_data transfer between contexts.

diff --cc bta/dm/bta_dm_act.c
Simple merge

diff --cc bta/dm/bta_dm_api.c
Simple merge

diff --cc bta/dm/bta_dm_int.h
Simple merge

diff --cc bta/include/bta_api.h
Simple merge

diff --cc btif/src/btif_gatt_client.c
Simple merge

diff --cc stack/btm/btm_ble_gap.c
Simple merge

diff --cc stack/include/btm_ble_api.h
Simple merge