Merge "remove zoomcontrols from ThemeDeviceTest" into oreo-cts-dev