[automerger skipped] Merge "C2 vp9, av1: Add support for conversion to...

[automerger skipped] Merge "C2 vp9, av1: Add support for conversion to RGBA1010102 for 10-bit decode" into tm-dev am: aa88108b -s ours am: 111ff489 -s ours am: 32c837dd -s ours

am skip reason: Merged-In I0b7fd8b581e39df65c5984ece4a6fdbe646d18a1 with SHA-1 5c467652 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18605040



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