[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: f6ce96c9 -s ours am: 6461acbf -s ours

am skip reason: Merged-In I230b5f0635b0daf766d64dc0347779c0cc659e37 with SHA-1 4aa70db3 is already in history

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

Change-Id: Ifdb1e071c933915db5f14f0e1d20c2f50eae39d7