Merge "Call getPackageUidAsUser instead of getPackageUid"