Merge "Expose Basic VCN API surface" am: 54e89ebf18 am: eb9d1a8d9d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie07ac92ba45166f2115661bc19f52c48e7815911