Merge "ART: Extend run-test timeout logging time"
am: ae9408f46a

Change-Id: I4d236e966624f3c2b5f9bb7b56b2f96c45cd0a6b