Merge "Merge 25Q1 (ab/12770256) to aosp-main-future" into aosp-main-future am: 0e4887b8

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



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