[automerger skipped] DO NOT MERGE - Merge Android 13 am: 282b0666 -s ours am: 9be91caf -s ours am: 4aa5a52a -s ours am: 121895ee -s ours

am skip reason: subject contains skip directive

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



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