[automerger skipped] Merge "Refactor Tuner 1.0 vts to use dynamic...

[automerger skipped] Merge "Refactor Tuner 1.0 vts to use dynamic configuration" am: 6ece00fb am: 8a2fa331 am: 78236e4e -s ours

am skip reason: skip tag Change-Id I13e6ea3d91e474c10e4f822a6ce59d99cc7c7d1d with SHA-1 e6915053 is already in history

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

Change-Id: I8cfc045f256be35d208069c3c66c4b20a1ded2f8