Merge "Merge "Merge "Grant visibility even when not granting URI perm" into...

Merge "Merge "Merge "Grant visibility even when not granting URI perm" into rvc-dev am: 32ff9bfa am: b5d46d52" into rvc-d1-dev-plus-aosp am: 1532f95b" into rvc-qpr-dev-plus-aosp am: 1488c200

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

Change-Id: I202c3a8ee3b0f795189e4ecd9c23894f2a870408