[automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future am: 1efd053b -s ours

am skip reason: Merged-In I9bea2cd0698d541364c535ad57a05b6d27d33782 with SHA-1 6c3b2eb3 is already in history

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



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