Merge "[automerger skipped] Merge Android 13 QPR1 am: 1abdcba6 -s ours" into stage-aosp-master am: d3131fb5 -s ours am: cbc72238 -s ours

am skip reason: Merged-In Id2cc220b9122eec412823f577f07ecd82bad60fc with SHA-1 3db9508b is already in history

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



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