[automerger skipped] Merge "Update VkJson to not visit features based on a specific version" am: 0eb46176d5 am: 39f3a4ade4 -s ours am: 6969537048 -s ours am: 6d1a7e84f0 -s ours am: 6cc2d06746 -s ours

am skip reason: Merged-In I6e71a84b85874a71031734004b8e44ee0ea7446f with SHA-1 fa7af49235 is already in history

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

Change-Id: I38d3557c57fc550e027715dabe9d440807c2b093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>