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

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

Change-Id: I025c332425a41f9508f8728929fe7147cbbf3723
tree: d97dd68e741993a08e2d630eba5763dc89b8873b
  1. tests/