Merge "Merge "Merge "Grant visibility even when not granting URI perm" into rvc-dev am: 32ff9bfad4 am: b5d46d5274" into rvc-d1-dev-plus-aosp am: 1532f95b56" into rvc-qpr-dev-plus-aosp