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

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

Change-Id: Iae1c1093888e83944b2a4914ec05deeb5076aaed