Merge "Allow SurfaceFlinger to treat 170M as sRGB." into tm-dev