Merge "Allow VK_API_VERSION_1_2 in VkJson" am: 3ce4a1b9a2

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

Change-Id: Ib808aa5bcdd66d493eefc69cff1b5a9161b8886c