[automerger skipped] Merge changes from topic "migrate-vcn" into main am:...

[automerger skipped] Merge changes from topic "migrate-vcn" into main am: 0603d70e am: eada5815 -s ours

am skip reason: Merged-In I165e83135c557619518257eb79a00b9ce5802c76 with SHA-1 d6ecfc7d is already in history

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



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