Merge "Fix unit test for DevicePolicyManager"