am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev * commit '4a90942e': SurfaceControl: Add colorTransform to DisplayInfo