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

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

Change-Id: I495c685ee9b0672257047a3868ea3fb5b30e1aa4