Merge "Fix pairing multiple devices in a row" am: aa6e5868

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



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