[automerger skipped] Merge "Override gtest timeout and add logging" am: cb844d5695 am: 65eddf19ba -s ours

am skip reason: Change-Id I0825305258bae20ea6e13e9b9a65ce30b7153611 with SHA-1 fffbdfa1eb is in history

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

Change-Id: If29a80fd8a5f4f0cb2ec8b159af995b84f9e2f7d