Merge "[SurfaceFlinger] Filter out wide color modes for built-in display when necessary." into qt-dev am: 20d5739bb5
am: 3ceda1d7aa

Change-Id: Icf42bf99f0e607e6e53ff626c75f03b25e516df8