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

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

Change-Id: I6154fc26bb571e4a4a377adda3cbaea353c3aa02