Merge "Add a flag to control the exposure of VCN APIs for mainline migration" into main am: 605563e333 am: bc049535ad

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

Change-Id: I7498615ae03f0bef76806459708eebdc5c938b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>