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

* commit '4a90942ea75039f916d8371111fdc41a80039b98':
  SurfaceControl: Add colorTransform to DisplayInfo