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

[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" am: 00741bf7 am: 16efd1b5 -s ours am: f54438dd -s ours am: 207733cd -s ours
am: f7e1996f -s ours
am skip reason: change_id Ib0a552ffc06286e63f8114db5d918718fcc1c3cc with SHA1 d15f232d is in history

Change-Id: I5cbbb1c64427c1a579760b0e540d8338ea6cbd15