Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into cw-e-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98b am: c074592e
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result