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