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

Change-Id: I714bbd84d2f62cfadc92367fe8fa45e8c3697d1a