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
tree: 4fc0318c78fc47e115318c036238f27dea0da393
  1. tests/