Merge "Add VcnContext, Vcn skeletons" am: ebc78a4cb5 am: 8337c53b5b

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

Change-Id: I59369942bde7a51d3838d6a6351134f69179defc