Merge "Fix getStorageVolumes to return public volumes visible to userIdSharingMedia with." am: e6454053ce am: 0f116cb7b5 am: 780a3907c8

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

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