Merge "DevicePolicyManager unit test improvements:"