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

This reverts commit 006364617495fe1df8bd9b2db5f61a726a55ff05.

Bug: 79703832
Bug: 130553855
Reason for revert: Regression with cross-key pairing

Change-Id: I1171a0255ad13c4e5ae993a0aab2eed3dfab19af
Merged-In: Ib0a552ffc06286e63f8114db5d918718fcc1c3cc
8 files changed