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

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

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