Merge "clearCallingIdentity before calling into getPackageUidAsUser"