Merge changes from topic "migrate-vcn" into main am: 0603d70edd

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

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