[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: f4ba1c44 am: 52d26b0e am: 99686f56
Change-Id: If67e79b47e46c5808dff364e9a51da247e2c82f3