Merge "Merge "Grant visibility even when not granting URI perm" into rvc-dev am: 32ff9bfa am: b5d46d52" into rvc-d1-dev-plus-aosp