[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" am: a0405072ae

Change-Id: I4ec1073f72e707628bd2b01a6dfe8461b0abfaf1