[automerger skipped] Merge "Ensure that pairing state is reset at the end of...

[automerger skipped] Merge "Ensure that pairing state is reset at the end of GATT service discovery." into tm-qpr-dev am: b61ca5a8 am: b16d27bd -s ours

am skip reason: Merged-In Ia3562b187174b10b2b3dc2ace3dc6c622724320b with SHA-1 54b06fc0 is already in history

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



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