[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: 9aaef556 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id31f30a22cbebc12e046d983041d4d317d70a618