[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: a7ae58c9 -s ours

am skip reason: Merged-In I1695a4b6ff321ec0ed74da29c3238257ecec72d1 with SHA-1 8e776104 is already in history

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



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