Merge "Revert "Separate SDP procedure from bonding state (2/2)"" into q-keystone-qcom-dev