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: Iaa08e7e2113595738b4d8730ed4e1b3a332cda33