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

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



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