Merge "Add test mapping and setup tests for VCN" am: a569019536 am: ee28787cd7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477131

Change-Id: I4aa674a9f29feb5bc39192b0198ea31f0223651e