Merge "Fix a way for this test to flake." am: 43370c622d

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

Change-Id: I2318a6d1a6d6ac4b142fc998f0c5efbe93b68707
tree: 7797ccc99291c712016daedfb9e68bdee4d85cf2
  1. tests/