[automerger skipped] Merge "Merge "Reland ag/24529645" into tm-dev am: ee7aff61" into tm-mainline-prod am: 2c86eff4 am: 79a3f596 am: ad1707af am: daafbc8e -s ours

am skip reason: Merged-In Ie7210673d65656ef9dbb2a4759a3636025b67b44 with SHA-1 31323451 is already in history

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



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