Merge "Ensure that pairing state is reset at the end of GATT service...

Merge "Ensure that pairing state is reset at the end of GATT service discovery." into tm-qpr-dev am: b61ca5a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21675743



Change-Id: I3c33801c1af06a679e9987bff69d5eff1b7105f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>