Merge "Remove some getCallerIdentity variants in DevicePolicyManagerService"