Merge "Revert "Enfore cross user permission to getPackagesForUid"" into sc-dev