[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: 95580435 am: e59a5f46 -s ours

am skip reason: Merged-In I6b166ac191a80c600b527266f53107b8d9c78177 with SHA-1 c04c7a23 is already in history

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



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