[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state...
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f807 am: ea5e8148 am: 81488162
Change-Id: If67e79b47e46c5808dff364e9a51da247e2c82f3