Merge "Merge "remove zoomcontrols from ThemeDeviceTest" into oreo-cts-dev am: 4e8a88c7cb" into oreo-mr1-cts-dev