[automerger skipped] Merge "Backport regression fixes for 288144143" into...

[automerger skipped] Merge "Backport regression fixes for 288144143" into tm-dev am: bb4015e5 am: 4df0f1ea am: f434b524 -s ours am: f3fbdf60 -s ours

am skip reason: Merged-In I78a249561fd8ccab38e32fe2e14d90e3b4420dcb with SHA-1 88db52eb is already in history

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



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