[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 17eaf20e...

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

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

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



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