Merge "Merge "Merge "Merge "remove zoomcontrols from ThemeDeviceTest" into oreo-cts-dev am: 4e8a88c7cb" into oreo-mr1-cts-dev am: c8457c2214" am: d16f7aea45 am: 50217e7287" into oc-mr1-dev-plus-aosp
am: 637e5f7d3c

Change-Id: I0d30e4761fcb6d6299c8479ce655661b6cb0f83c