[automerger skipped] DO NOT MERGE - Merge Android 13 am: 282b0666 -s ours am: 9be91caf -s ours am: 4aa5a52a -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: I4b19c54ffd3a24fa1d4400d09f1860fe4df55c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>