Merge "Attempt to reduce test flakiness." into rvc-dev am: ef5e255208 am: 66326ba527 am: 609b5b38b3 am: a30b848b54

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

Change-Id: I0419fa640ad6b1f88a2c0cdff6f3b54b6bbd2a7a