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

Change-Id: Iaa354a1217637b07117d9e313b11046265f9b1d7