[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 3bde35bb -s ours

am skip reason: Merged-In I25a226b8eb962138489f30cd0fa1a42c3e599bdf with SHA-1 aa357b36 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/25973939



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