Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into mnc-dr1.5-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff am: c074592eac am: 6479e3651f
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff am: c074592eac
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
tree: 4513e9ee589b6393d66f5f8b27bb1d26f5b62a24
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE