Merge "Merge "Increase a timeout that's too short" am: 6cc5d32e6f am: c2944b4510" into rvc-dev-plus-aosp am: beea5660bc

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

Change-Id: I18c4269a17d01bf649801acdbd519cccfcde24ca
tree: 4fc0318c78fc47e115318c036238f27dea0da393
  1. tests/