Merge vk-gl-cts/vulkan-cts-1.3.0 into vk-gl-cts/vulkan-cts-1.3.1

Change-Id: I348041254e129d38fd3c434945263f93f1582093

diff --cc android/cts/master/vk-master-2021-03-01/dynamic-rendering.txt
Simple merge

diff --cc android/cts/master/vk-master-2021-03-01/renderpass.txt
Simple merge

diff --cc android/cts/master/vk-master-2021-03-01/renderpass2.txt
Simple merge

diff --cc android/cts/master/vk-master/dynamic-rendering.txt
Simple merge

diff --cc android/cts/master/vk-master/renderpass.txt
Simple merge

diff --cc android/cts/master/vk-master/renderpass2.txt
Simple merge

diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSharedPresentableImageTests.cpp
Simple merge

diff --cc external/vulkancts/mustpass/master/vk-default/dynamic-rendering.txt
Simple merge

diff --cc external/vulkancts/mustpass/master/vk-default/renderpass.txt
Simple merge

diff --cc external/vulkancts/mustpass/master/vk-default/renderpass2.txt
Simple merge