Merge "remove CtsUiAutomatorTestCases" into nyc-dev