[automerger skipped] Merge Android 14 am: d5ebe78414 -s ours am: e7cec7d111 -s ours

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

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

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