[automerger skipped] Merge "Merge Android 24Q1 Release (ab/11220357)" into...

[automerger skipped] Merge "Merge Android 24Q1 Release (ab/11220357)" into aosp-main-future am: afd3148a -s ours

am skip reason: Merged-In Ia76f781f5046d51c78f851730789a62d8089e122 with SHA-1 bb68e9ae is already in history

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



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