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

[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" am: 410181ce am: 6e5f7c5e am: c6cd9641 am: 1d8e4d94 skipped: edc210db am: 9f7f81ae am: f11460c8
am: ac5735bf -s ours
am skip reason: subject contains skip directive

Change-Id: I276fdd20b81f08cc4a7defd6aadb8c2068f11c05