Increase timeout to avoid flaky tests.

Also, print extra information when an error occurs.

Bug: 149562320

Test: Ran unit tests.
Change-Id: I3404549db0ac18a4a82a99b2620556db96376bca
Merged-In: I3404549db0ac18a4a82a99b2620556db96376bca
(cherry picked from commit afc0ff7fe06aee9822fac97e52d1fba09c695d8b)
1 file changed