[automerger skipped] Migrate VCN to separate non-updatable libraries am: 60df934b -s ours am: a96a1c42 -s ours

am skip reason: Merged-In I747556281db2efab7115761147842d241fe283de with SHA-1 576784e4 is already in history

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



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