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

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

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

Change-Id: I30de62144cbda5d852f2d06a221aa00f2e7ab1d7
Signed-off-by: Automerger Merge Worker <[email protected]>