[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 skip reason: subject contains skip directive

Change-Id: I276fdd20b81f08cc4a7defd6aadb8c2068f11c05