[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 32b7fd00 -s ours

am skip reason: Merged-In Ic226cb68160fcb011594b2a07f1502fbc59b567a with SHA-1 ae975470 is already in history

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



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