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

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

Change-Id: Id4b79fb2542b9b1e481621cb125f959fc261f493