[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 1425bf6c -s ours am: 92bfd9cd -s ours

am skip reason: Merged-In I3ceefaad9b420f86e4f0b524e6f0b5649af9997b with SHA-1 39f241ae is already in history

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



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