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