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:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours am:
a2185db6d3 -s ours am:
2e43c1a7b7 -s ours am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours am:
28c62892b6 -s ours am:
7ddbcb0da0 -s ours am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history