[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: 3efe52e7 -s ours
am: 5f471b45

Change-Id: Ic7a16bebfb433c3a235c27f92d3b0c40932800d8