[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: f6ce96c9 -s ours am: 6461acbf -s ours am: 81a4f0cc -s ours am: 6ee49c3b -s ours am: 351ae21e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I67bbb0f0f6e4b160b390c255104f951ed0301029