Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am:...

Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fad am: b976b9b6 am: b3be8d98 am: 800b47fb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135



Change-Id: I028f41717d1d5cd3a3a695c0103bae288b611342
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>