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

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

Change-Id: I3804d04b47c06105a56a84abae8d01f308331877