Merge "Improve secondary volume mounts on user switch" into sc-dev am: 58b08869 am: 2ba02de0 am: dd5dae58

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

Change-Id: I70b9a2fe47802a96cda220bf3483c4ac84469144