[automerger skipped] Increase timeout to avoid flaky tests. am: 4cba155da9 -s ours
am skip reason: Change-Id I3404549db0ac18a4a82a99b2620556db96376bca with SHA-1 afc0ff7fe0 is in history

Change-Id: I58fbc14f452aadd127ff69c75974e10a192dcb2c