Merge vk-gl-cts/vulkan-cts-1.3.1 into vk-gl-cts/dev/VK_KHR_roadmap_2022

Change-Id: Iff63540ee97f97d9e860d655439f0f85ca5ee00d

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

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

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

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