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

Change-Id: Ie29e540d045951fe6e1b270003778f0a1fd194a5