[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

Change-Id: I29ccd633d0ae2b71bbe30f3571ce9755e233a324