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

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



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