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

Change-Id: I359e69414a8ee19cb4f6bdce7b6b759477be69e7