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

Change-Id: Ia73b9cd4af0870b9898011fcfa5d4970a003f0c7