tree 4fc0318c78fc47e115318c036238f27dea0da393
parent a4ad47a46bbfa9f3f0c9572ae9573b0e23bdafed
parent c2944b451007582c1000af9cb9d600a758888078
author Treehugger Robot <treehugger-gerrit@google.com> 1594308953 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594308953 +0000

Merge "Increase a timeout that's too short" am: 6cc5d32e6f am: c2944b4510

Original change: https://android-review.googlesource.com/c/platform/cts/+/1358064

Change-Id: I8d079fc0a514d7ada44df54b986de50455a730d5