[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: a752e8b1 -s...

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: a752e8b1 -s ours am: 69415da0 -s ours

am skip reason: Change-Id I913ff04a6c4568c0326866fd4462fb25f4eb317b with SHA-1 821a2a53 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8317ddfd6acf1ccd809344a6cd74485bda03922