DO NOT MERGE - Move color mode to DisplayTransformManager am: cd2b7aea5f
am: 7f3176aceb  -s ours

Change-Id: I8c3c1858f03f13104d60f4b58de3bb2189f76248