[automerger skipped] DO NOT MERGE - Merge Android 13 am: 282b0666 -s ours

am skip reason: Merged-In I3ceefaad9b420f86e4f0b524e6f0b5649af9997b with SHA-1 39f241ae is already in history

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



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