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 am: a69ae35e

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

Change-Id: I9e5301278a23118b34f4cb86dc4367ab55b40977