[automerger skipped] Merge 24Q3 to AOSP main am: dae9981e -s ours

am skip reason: Merged-In I8d422c6e786160d7e5f8ec70f9c20cc61d8d5423 with SHA-1 f878efd9 is already in history

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



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