Merge "Improve secondary volume mounts on user switch" into sc-dev am:...

Merge "Improve secondary volume mounts on user switch" into sc-dev am: 58b08869 am: b3e9d6be am: 4bb589ca

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

Change-Id: Ibc9883b610a378bfcbda533058095620e09e052a