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

* commit 'f615872cb49062de9113c7c5be31d3b1d1b423af':
  SurfaceControl: Add colorTransform to DisplayInfo