Merge "Increase timeouts in Test_runWithTimeout" am: e646717cdf am: 728105d7b6 am: a437d6a959

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830674

Change-Id: I2699e6e8ae0925e4dcde3b60eaceb3ee5ef11e47