Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: eec52d92 am: bd224b26
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: eec52d92
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result