Merge "Prevent infinite rebind" into tm-dev am: ba00fdc0 am: ef004beb am:...

Merge "Prevent infinite rebind" into tm-dev am: ba00fdc0 am: ef004beb am: 8f816329 am: fdcc842f

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



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