Merge "Update GenericItemTest to conform to json requirements" am: cbe19f0418

Original change: https://android-review.googlesource.com/c/platform/tools/loganalysis/+/1831757

Change-Id: I67a0f6db77c0525cb1f03e6c6f2b64eb82c1bf30