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

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

Change-Id: I9f8562b9f3a16807e6ec0fd77b54287647d0e054