tree 4310acd4444ceb4d2e6f4c67d636d39a0173a381
parent 903b0f6313893d5075e612f2a859a87b257f54df
author Myles Watson <mylesgw@google.com> 1556735703 +0000
committer Myles Watson <mylesgw@google.com> 1556735977 +0000

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