Merge "Make search tests not flaky" into rvc-dev am: 7f937cd7 am: 925c23c7 am: 145afb21 am: 3c68a566

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

Change-Id: I0cc5e3eb2074f4d3fde23cdeef250aeb430e8566