Merge "vkjson: remove unused codes" am: 682f459f94 am: 131370cf68

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bf4ff624d50a17179786410bba465ea65967bdd