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

[automerger skipped] Merge "Backport regression fixes for 288144143" into tm-dev am: bb4015e5 am: 18156e3a -s ours am: c79ace3c -s ours

am skip reason: Merged-In I78a249561fd8ccab38e32fe2e14d90e3b4420dcb with SHA-1 3e075acd is already in history

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



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