Merge "Unable to mount filesystem in fastbootd mode on the user build." am: 7723c72cab

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

Change-Id: I1093e922d7251b9a30bc5b450f1ed924892f5cac