Merge changes from topic "export-vcn-flag" into main am: 774cbccb

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



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