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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfc5997add6879408a4837fa8d0317af0cacba8b