[automerger skipped] Merge changes from topic "cherrypicker-L99700000959993428:N15700001359158215" into tm-mainline-prod am: 9307ac91 -s ours am: b1437434 -s ours

am skip reason: Merged-In I9a352cd25825ca325cd7355f9e4911019945b193 with SHA-1 1ef232f9 is already in history

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



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