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

Merge "Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae am: 95846eed" into rvc-d1-dev-plus-aosp am: 3ef9881f

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

Change-Id: I5779f5fd23420572629d6f1e995de022c1a9edbc