[automerger skipped] Merge "Override gtest timeout and add logging" am:...

[automerger skipped] Merge "Override gtest timeout and add logging" am: cb844d56 am: 65eddf19 -s ours am: 478757a9 -s ours am: 20064121 -s ours am: 5c695b6d -s ours

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

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

Change-Id: Ib1f7d39bd0e358bef6e498ee9a5f1b7759a43be6