Merge "Merge "C2 VTS: use mime instead of component name in DecodeTest" into...

Merge "Merge "C2 VTS: use mime instead of component name in DecodeTest" into android12-tests-dev am: fd05de2d" into android12L-tests-dev am: 8046eb91

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



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