Merge "Merge "Fix DEQP failure regarding VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT:" into oc-dr1-dev am: 4e831d2e4e" into oc-dr1-dev-plus-aosp