Merge "Ensure that pairing state is reset at the end of GATT service discovery." am: b1ad7a8c

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



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