Merge "Fix wrong log information in DevicePolicyManagerService"