[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev am: eaba510a56
am: 6cec376495 -s ours
am skip reason: change_id Ifefb749e0274ae018714340654287a0412b59b89 with SHA1 55d82d63b7 is in history

Change-Id: I0373b8b57569327988f61c0b617de280682ed842