Merge "Update DevicePolicyManagerTest error messages"