[automerger skipped] Merge Android 14 am: d5ebe784 -s ours am: e7cec7d1 -s...

[automerger skipped] Merge Android 14 am: d5ebe784 -s ours am: e7cec7d1 -s ours am: 6b095085 -s ours am: d5434eaf -s ours am: 427f802e -s ours

am skip reason: Merged-In I580dd68913bf43b1f14c0bed17d6990d733b3977 with SHA-1 6a3ebb92 is already in history

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



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