[automerger] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 36ba892cf9 am: a37455ef23

Change-Id: Ie7363583d2d47793faf26461630f253e8b46ab1b