Merge "Revert "Delete CtsUiDeviceTestCases""