Merge "Fix GTestResultParser compatibility" am: 44c14f778b am: 6badfaa8b5

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352763

Change-Id: I13156db2e3016d816fbd19ac4ec7bbee87c2855f