Merge "Add timed out test files to tidy_timeout_srcs" am: f6eada7e37

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1991386

Change-Id: I6270feae5e386f428760892f457d608a986cbc5d