Merge "Fix getStorageVolumes to return public volumes visible to userIdSharingMedia with." am: e6454053ce

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

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