Merge "surfaceflinger: default to DisplayColorSetting::ENHANCED"