Merge "Allow volume paths from both users when verifying file columns." into sc-dev am: 604a342f14 am: 5baf1a2ab6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/14623053

Change-Id: Icb1f4d19fcb6a2d28e9d399b8f6301b0484f2d86