Merge "Add timed out test files to tidy_timeout_srcs" am: 13dcb55b9d am: 2c3c44e264 am: eea4f55b52

Original change: https://android-review.googlesource.com/c/platform/system/testing/gtest_extras/+/1991060

Change-Id: I1b21127402732af4519beae344d436bfc1f35d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>