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