[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: a4fa9d00 -s...

[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: a4fa9d00 -s ours am: f0fe1bc3 -s ours

am skip reason: Merged-In I0e090738c3f5c10ecccf4dc248a3f6eaa1c595a3 with SHA-1 06b8a73b is already in history

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

Change-Id: Iebf9db7070a63129de23d359495ffdfad0bdbb1e