[automerger] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 827d5c6f0a am: b78f9512b6 am: 950c8a191e am: 04bef3be7d

Change-Id: Iacda32c1480d20e7b481b0769d87cd1f381cb7e7