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

Change-Id: I702778252c51ab003b4adc39048b2dc630dd9a14