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

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