Merge "[SurfaceFinger] Adds auto color mode support in SurfaceFlinger." into pi-dev am: ac6521d7cf
am: 3823b38691

Change-Id: I11f228b0e7e1ff701f4c2c993b6ae10ef8b117dc