Merge remote-tracking branch 'origin/vulkan-cts-1.2.2' into vulkan-cts-1.2.3

Change-Id: I3c5b289149d9f2601b5d5ab8986d41b3f33f8bab

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

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

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

diff --cc external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemStorageBufferTests.cpp
Simple merge

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

diff --cc scripts/android/build_apk.py
Simple merge