Merge "Do not umount /mnt/vm" into main am: 15fd73eab0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3261819

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