Merge "Make search tests not flaky" into rvc-dev am: 7f937cd7e3 am: f040f3b049

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/11680877

Change-Id: I700101218ffcec41532f09902441e16505c4217f