Merge "Fixing Storage Volume listing for Cloned User." into tm-qpr-dev am: 95580435

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



Change-Id: I20636a29649c9c046a231204bbe1499f1be12b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>