Merge "SurfaceFlinger: fix sysprop API condition for color management"