Merge "C2 VTS: Add support to choose component/s to be tested" am: f77640ee72 am: 731a3dc12d am: cb3caf22f2

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

Change-Id: If3caa86f6784463c7bccbed2292f4d723a4f9bac