Merge "Add timed out test files to tidy_timeout_srcs" am: ff54f73b4f am: fa83970b3a

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

Change-Id: I26b2d04160013fec26fdaadf56caeb919ff4d5bd