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

Change-Id: Icd9951675f2f20cdc632d4514c0a59f0c6ce695d