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