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

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



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