[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 185be3fd -s ours am: 45398926 -s ours am: 41e13fca -s ours

am skip reason: Change-Id I49c256b33345cc105a1fb610e217cb68bedb521d with SHA-1 34584ceb is in history

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

Change-Id: Ifedc5842e8eb89e4a23d058f58e2a0a4bb6e062f