[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 17eaf20edf -s ours

am skip reason: Merged-In Iab622594932049cdc08d33f50bc817b056e2e577 with SHA-1 6071b9f69e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3258117

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