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

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

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