[automerger skipped] Merge "Fixing Storage Volume listing for Cloned User."...

[automerger skipped] Merge "Fixing Storage Volume listing for Cloned User." into tm-qpr-dev am: 4a5b6525 am: c74bff21 -s ours

am skip reason: Merged-In I617bae9b201fd66d7b62b6cbd1c48b9f276f1924 with SHA-1 4e65c53b is already in history

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



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