[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: a0fe7093 -s ours

am skip reason: Merged-In Ic86a4ce45c46162f47b4cf846a37fc281ad3b01b with SHA-1 e20145d3 is already in history

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



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