Merge "Revert "Enforce package visibility to the api checkUriPermission"" into sc-dev