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

Change-Id: I200991c9d4cf30c130bdb82a80071bba4db33d74