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

Change-Id: I3d6bf2471abad52bda92fe33af48847561ca11a1