tree cd5f0afc33f762d2e43a60ce92166163b83d95f9
parent 3865c8b6f90eaf2a56dc1388f0846df73bc18546
author Myles Watson <mylesgw@google.com> 1556735539 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1556878995 +0000

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

This reverts commit dc14eb8ba01ee20dc44bcba7b3c0a17550e756fa.

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

Change-Id: I2c8bf4f6c41f87bd6b7b217486260da4a084e4bd
(cherry picked from commit 6d9d811e1ad6f89275a3202f295028e920af5bb0)