[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: b6af0e3c -s ours am: acbef46b -s ours am: 9574400a -s ours

am skip reason: Merged-In I27d15d7652ac69bae06e0281fd012e84ef8e8fba with SHA-1 f11b85a5 is already in history

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

Change-Id: I39ff5ac75d327180138dfa086f0ff8ae73fd504b