[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" am: 51a7895a37 am: 659b3878ff -s ours am: 0f2a6a6162 -s ours
am: f610b1828f -s ours
am skip reason: subject contains skip directive

Change-Id: I9b5deabcf0521f46b972ba9eb46c7c784f418b45