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 am: 68d94e7d7c
am: 962ca53841

Change-Id: I74573794d8468bc23bc62bc66561b4806b07a8a1