[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from...

[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am: 50e6566d am: 28046588 -s ours am: c4d132a6 -s ours am: 9c5d78b3 -s ours
am: b9eddbf8 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 72f53256 is in history

Change-Id: I5340bdf60f1ee6919a665377e94ac1b7a12e0ea8