Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 am: 95846eed9d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: Ic5f8bf0637ef0bd5227326c6210a1e244e9487e4