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

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

Change-Id: I2a7bccad7a2536e6478392e0e97dcdd15ef0ce37