Merge "Merge "remove zoomcontrols from ThemeDeviceTest" into oreo-mr1-cts-dev am: 50c3f1af77"