Merge "Revert "Enable VTS for product modules"" am: 5a81c3dc1c

Original change: https://android-review.googlesource.com/c/platform/test/vts/+/1513661

Change-Id: I07d8fa9edb9cc7ad688e4097688ae7740ebae79c