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

* commit '8dcd14cdc95a5b71597fa428b9c2a45c3a86944c':
  SurfaceControl: Add colorTransform to DisplayInfo