Merge "Revert "[vs] Extract writable partition initialization into a ne..."" am: 1004aabbcc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2547491

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