[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f807 am: ea5e8148 am: 81488162 am: 2f19a132 Change-Id: Ifc01741e99c7912c459ee9178c1c8533599df240