[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"" into pi-dev
am: 6274e9f031 -s ours
am skip reason: subject contains skip directive

Change-Id: Id13140837e581d23359782345fd49b8b4c55542c