Merge "Prep VCN files for exposing APIs" am: f0aa57318d am: 278b748966 am: 78e931383c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f018bfe94e7e020bcf262dae70687ded56d222e