[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: ee6465bf28 -s ours
am skip reason: change_id Ib0a552ffc06286e63f8114db5d918718fcc1c3cc with SHA1 6be8793922 is in history

Change-Id: I5cbbb1c64427c1a579760b0e540d8338ea6cbd15