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

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

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