[automerger skipped] Fix rc connect fail after remove bond am: 73e49b2e am: 647001cb -s ours

am skip reason: Merged-In Ib1a23c5bcd076e2e0a395b6b9a10fca90355d0df with SHA-1 f6548320 is already in history

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



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