tree feba5579bf085dc3b3dae986b46e97d6d883be36
parent 947ce6df2e4dee7a154f44a170330b320cfb1d10
parent 78e931383ceeac55bc8ab269957770930934c707
author Benedict Wong <benedictwong@google.com> 1611734648 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611734648 +0000

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