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

This reverts commit 36ba892cf96f41598d4631251d2a2c66aceb227e.

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

Change-Id: Ic08fe7f59549de9398c6282c1b2fdb51c39317d3
6 files changed