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

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

Change-Id: Ic84fb5eccfe674a937a7d423b5c3e7f11720fc21