Merge "Enforce package visibility filters to grantUriPermission()"