Revert "Separate SDP procedure from bonding state (2/2)"

This reverts commit cae889a6f7dc585dcc5aeb2694e752675bee872d.

CRs-Fixed: 2441692
Change-Id: If6e154079e5077e2cc737fe0b51acfd68e6ee108
13 files changed