Merge "Mount /mnt/vm earlier" into main am: 65daca3b88

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3261786

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