Merge changes from topic "am-0915014a8cdb427da197d6f5e948985b" into qt-r1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: 519c5338 am: 0052770e -s ours am: 111aca0a -s ours am: 80e83cbb -s ours am: cb0de39d -s ours am: 6de397fc -s ours am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 add688f6 is in history
  [automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: b5268c5b am: 286cfd69 -s ours am: b6e53063 -s ours am: c77fe253 -s ours am: fa6be4f1 -s ours am: 51fb87ee -s ours am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 add688f6 is in history