Merge "Revert "Add test to ensure enforceCrossUserPermission of getPackagesForUid"" into sc-dev