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

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

Change-Id: I93aedee05e450ace822846cef90086928ec6c699