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

[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: f4ba1c44 am: 52d26b0e am: 99686f56 am: 66e72bea skipped: b77ddb59 am: be09c001 am: dbe1fca6 am: 5a9e319b -s ours am: ecea4f43 -s ours
am: f3c2b950

Change-Id: Ie01d2f24c53cb0749b292e728e9fee8680d102d0