[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: a0405072 am: 14b93605 am: 23c95297
Change-Id: Iaa354a1217637b07117d9e313b11046265f9b1d7