Also, slightly increase the timeout for each test run. Bug: 24198050 (cherry picked from commit daaaed18) Change-Id: I29e169e962da803a89abf0a28e071abcafa315b7