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

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

Change-Id: I581bd17ba3d44cad98ed1a8c09e1b8697d22de2b