Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"
am: 51a7895a37

Change-Id: I034e2e4b94f422d1f186ffcff03ae9acf6501bc3