[automerger skipped] Merge "Enhance Tuner 1.0 VTS testing and configurations" am: c991ca2d7f am: 7ffa0164f0 am: 9c85f6f53d -s ours

am skip reason: Change-Id Ie4dcc6cb284b2b57879f286c436f5bd9adf43201 with SHA-1 37719f3879 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I993051f4773344eaaa4d51067f115bd3696f26f7