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

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

Change-Id: Id057163ad05ba9809701b71776aed29e0916c4ff