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

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

Change-Id: I2df755022dae2eaac8e096c6f368b17c55556fdf