Merge "Allow VK_API_VERSION_1_2 in VkJson" am: 3ce4a1b9a2 am: 7cc33770c0

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1637597

Change-Id: Ia1be75874e19219338debb23278abbe90a4eb074