[automerger skipped] [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 am: 512f14cfb6 -s ours am: 3218dc1eaf -s ours
am: bebacb074f

Change-Id: Ic7a16bebfb433c3a235c27f92d3b0c40932800d8