Merge vk-gl-cts/vulkan-cts-1.3.3 into vk-gl-cts/main

Change-Id: Iaa17ebf16e629e5d5c221511fbd198d392dd92d5

diff --cc android/cts/main/src/vk-master-2019-03-01.txt
Simple merge

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

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

diff --cc external/vulkancts/framework/vulkan/vkQueryUtil.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
Simple merge

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