Merge "Fix NPE in DevicePolicyManagerService"