[automerger skipped] Merge "Fixing Storage Volume(s) Retrieval." into...

[automerger skipped] Merge "Fixing Storage Volume(s) Retrieval." into tm-qpr-dev am: 7527f61d am: a061067e -s ours

am skip reason: Merged-In I6835cc4d29f3e9c85731979aaf9ab12a30f6419b with SHA-1 65a5b2db is already in history

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



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