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

[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 18f2ffe0 -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: Ib63bcb81b2e0dd6ff15be92bf06eee7441984f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>