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

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



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