Merge "Make search tests not flaky" into rvc-dev am: 7f937cd7 am: f040f3b0 am: 59f0a2de am: 0160d003 am: a6180971

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

Change-Id: Iaad6d462f87b8cbedb60d9f41fb805621ec650ad