Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5

Change-Id: I9127426326658bfa984eb90837e731d8a26139c1
diff --git a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
index 472ef0c..eff193d 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
@@ -1446,6 +1446,12 @@
 				return tcu::TestStatus::fail("Out of retries, could not create instance and device");
 		}
 
+		// if the number of allocations the driver makes is large, we may end up
+		// taking more than the watchdog timeout. touch here to avoid spurious
+		// failures.
+		if (failIndex % 128 == 0)
+			context.getTestContext().touchWatchdog();
+
 		result = vkp.createInstance(&instanceCreateInfo, &allocationCallbacks, &instance);
 
 		if (result == VK_ERROR_OUT_OF_HOST_MEMORY)