[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to...

[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: 015ebf21 -s ours

am skip reason: Merged-In Ic6401ddfd1ea18d6f846bb8719ca798d2ef9bbf4 with SHA-1 3cc60340 is already in history

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



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