Merge "Add VcnLocation to reflect the VCN build system flag value" into main...

Merge "Add VcnLocation to reflect the VCN build system flag value" into main am: 36dfec66 am: e15c785b

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



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