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

Change-Id: Ie9f05de718d3874f84627ceb18c775b0fe50af28