[automerger skipped] Merge Android 14 QPR3 to AOSP main am: b4c7f490 -s ours

am skip reason: Merged-In Ie336e0729fb3194f7fb81a26ccbaa3e53f100f35 with SHA-1 e8c76749 is already in history

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



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