Merge "Change getPackageUid to getPackageUidAsUser"