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

Change-Id: I774878e0eea2bb4b559db62fde04769bd436639c