[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: 51a7895a
am: 659b3878 -s ours
am skip reason: change_id Ib0a552ffc06286e63f8114db5d918718fcc1c3cc with SHA1 6be87939 is in history
Change-Id: Ia251dc917434a92fbc1eea859d49bf70d0a52469