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

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

Change-Id: I5be2c8b2061a213a254fd67d8fa2a6ae02807094