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

This reverts commit a29d558076e5247954217f092494a23e91da5cbc.

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

Change-Id: Ic69f9e4f8e295b0797a272ace1b59e92d95131d1
(cherry picked from commit df512028159d4c21a4cf3b7ab520e9ba539fc414)
13 files changed