[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to...

[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future am: 4b6f5cac -s ours

am skip reason: skipped by delphij

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



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