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

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

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

Change-Id: I71912555190d24eeff284a40d0a1d2564993c157