[automerger skipped] Merge 24Q3 to AOSP main am: bd695990 -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: I2a4a48386615579ceb97219063d57c6823f15732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>