Merge "Add timed out test files to tidy_timeout_srcs" am: 17dc1b865b am: 7b82ea7d87 am: ba9c8f3b7d

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1990776

Change-Id: I27bb4a8cece08b80a1458904db83e6605bc2b97c