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

This reverts commit ab3278c8.

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

Change-Id: Ib0a552ffc06286e63f8114db5d918718fcc1c3cc