[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: 20eb9196 -s ours am: 41e69e2a -s ours

am skip reason: subject contains skip directive

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

Change-Id: If0788cb1e2c50322a91ae2f55e82b09ad0d37d00