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

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

Change-Id: Ib6f94b8cc637add1d1fd4f2876b19d4b1c03f3a6
tree: 913d908a31ef94f614e38fe39ff59f20e7e98765
  1. tests/