Merge "Update the VTS module according to the refactoring in aosp/2826571" into main