Merge "OMX VTS: Added a test to mandate transition to C2 codecs" am: d9aa226a60 am: fe02196fac

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1973542

Change-Id: I08180c3d22868bf9ef9bcceaf91b312c16587c5a