Merge "HWC2: Hook up setColorTransform/setLayerDataspace am: 5df2a86063 am: 23df91ddf3 am: 1e5f007fde"