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

Merge "Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fad am: 769f64e5" into tm-d1-dev-plus-aosp am: 2e189a52

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



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