resolved conflicts for merge of ed0bdd42 to lmp-mr1-dev-plus-aosp

Change-Id: Ife8b72d3688ed78a95ccb8d5e0b60f40e7fec9e9

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

diff --cc bta/hh/bta_hh_le.c
Simple merge

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

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

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

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

diff --cc btif/src/btif_gatt_multi_adv_util.c
index 2a61cc8,fc9da99..b32b8b5
mode 100644,100755..100644
--- 1/btif/src/btif_gatt_multi_adv_util.c
--- 2/btif/src/btif_gatt_multi_adv_util.c
+++ b/btif/src/btif_gatt_multi_adv_util.c

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

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

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

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

diff --cc gki/common/gki_buffer.c
Simple merge

diff --cc gki/ulinux/gki_ulinux.c
Simple merge

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

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

diff --cc stack/l2cap/l2c_main.c
index 325f7af,4563e8a..c2531a7
mode 100755,100644..100755
--- 1/stack/l2cap/l2c_main.c
--- 2/stack/l2cap/l2c_main.c
+++ b/stack/l2cap/l2c_main.c

diff --cc stack/smp/smp_keys.c
Simple merge

diff --cc udrv/ulinux/uipc.c
Simple merge