Merge "mediav2 CTS: Update mediav2 resource directory from 1.10 to 1.11" am: 0225541fe6 am: c0c808f599

Original change: https://android-review.googlesource.com/c/platform/cts/+/1654888

Change-Id: I1b2da53dae166911a49af3317f98c12be0b56713