Merge "Revert "Timeout the test run before go/ab timeout to capture test info""
am: 42cd8e7ca4

Change-Id: I5a6e0b270dd992e9c69dda760d285c2476423ed4