[automerger skipped] Merge "Migrate VCN to separate non-updatable libraries" into aosp-main-future am: bffb1a7f04 -s ours

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

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

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