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

Change-Id: I563a42fbab7b32ec91d403707814d795b4e9f267