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

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

Change-Id: I034d71ebb3d94ef1e96d16ca715ffac1ec7532cb