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

Change-Id: I531ee0a30003378d566d375965049b413b6a97f0