Merge "Grant visibility even when not granting URI perm" into rvc-dev am: 32ff9bfad4

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

Change-Id: I96f349396f8e4e4244fab043697f68e1672ff897