Merge "Initial add wvts to build" am: 0f8236bb am: 8d6ebee5 am: 1079601a

Original change: https://android-review.googlesource.com/c/platform/build/+/2374652



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