Merge "Override gtest timeout and add logging" am: cb844d5695

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

Change-Id: I36332a20b0a4e9f6a71a8a640c3d853e6c81cc6e