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

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

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