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

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

Change-Id: I4f02725faeee1e2ac0cd7c9cc1f76cccda6444a4