[automerger skipped] Merge "Merge "Reland ag/24529645" into tm-dev am:...

[automerger skipped] Merge "Merge "Reland ag/24529645" into tm-dev am: ee7aff61" into tm-mainline-prod am: 2c86eff4 am: 79a3f596 am: 0810aa60 -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: Ieac5a8a0733467269c3e3b9a700b4e602908d703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>