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

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

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