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

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

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