Merge "Update the VTS module according to the refactoring in aosp/2826571" into main am: 69efe8e753

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

Change-Id: I2caf7f422161556fa4b351383d9ded0b350ab59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>