[automerger skipped] Merge "Override gtest timeout and add logging" am: cb844d5695 am: 65eddf19ba -s ours am: 478757a955 -s ours am: 20064121a5 -s ours am: 5c695b6dea -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: Ib1f7d39bd0e358bef6e498ee9a5f1b7759a43be6