Merge "Backport regression fixes for 288144143" into tm-dev am: bb4015e5 am: 4df0f1ea

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



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