[automerger skipped] Merge Android U (ab/10368041) am: dc95f652 -s ours am: a2917024 -s ours

am skip reason: Merged-In Ibfae74a433ceb2e27900328161d3625b77e1765c with SHA-1 61e0951e is already in history

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



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