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

Merge "Merge "Grant visibility even when not granting URI perm" into rvc-dev am: 32ff9bfa am: 3f73a90f am: 79b877fb" into rvc-qpr-dev-plus-aosp am: a36fb449

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

Change-Id: I171ad143ad5c4ea67756b6b8c27c7d90119b3cd8