Merge "[ThemeHostTest] correct xxxhdpi zoomcontrol golden copy" into oreo-cts-dev