Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98b am: c074592e am: 6479e365 skipped: 3108a62a am: bf475341 am: e5bcf177 am: 92820f0e am: 9a4e9799
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98b am: c074592e am: 6479e365 skipped: 3108a62a am: bf475341 am: e5bcf177 am: 92820f0e
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98b am: c074592e am: 6479e365 skipped: 3108a62a am: bf475341 am: e5bcf177
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98b am: c074592e am: 6479e365 skipped: 3108a62a am: bf475341
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98b am: c074592e am: 6479e365 skipped: 3108a62a
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98b am: c074592e am: 6479e365
  [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