Merge "Adding larger timeouts for some CtsDevicePolicyManagerTestCases tests"