[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff am: c074592eac

Change-Id: I4560a77109abd6772f9a7ef7808d073699e23dc5
tree: 7bcfeb76fda91f18a12ee9135e67070847d231c1
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE