Merge "Update GenericItemTest to conform to json requirements" am: cbe19f0418 am: 433542682a am: 762cb6641c am: 5408a7a45c am: cb45cf70a7

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

Change-Id: Ic91bf3419b2849d9f762cf49fe6a4b48a24fa551