[automerger skipped] Merge ab/7061308 into stage. am: fa47f645 -s ours am: 793b0ac4 -s ours am: e7f1814a -s ours am: 1ddabd9d -s ours

am skip reason: Merged-In I22987a5868727366dcfb7c2291eccb863b311407 with SHA-1 49e45396 is already in history

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

Change-Id: I4af83071f40e3b69d23ccfc74293e648ab89678f