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

Change-Id: I5562c59f21db5e40afdb9fe5f6b2d062522372ad