Merge "Fix bad transport being used for 2nd pairing attempt" into main am:...

Merge "Fix bad transport being used for 2nd pairing attempt" into main am: 6601e54b am: 0d3157fe

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



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