[automerger skipped] Merge ab/7061308 into stage. am: fa47f645 -s ours am:...

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

am skip reason: Change-Id I22987a5868727366dcfb7c2291eccb863b311407 with SHA-1 49e45396 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I372073dbefdc8cc3d3f30b2946437af9ec0c001f