[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state...
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" am: 410181ce am: 6e5f7c5e am: c6cd9641
Change-Id: Iaa354a1217637b07117d9e313b11046265f9b1d7