[automerger skipped] Merge RQ2A.210305.007 am: fb6d3a6b -s ours am:...

[automerger skipped] Merge RQ2A.210305.007 am: fb6d3a6b -s ours am: c4ba0ccd -s ours am: 2dad6b76 -s ours am: 12e73978 -s ours

am skip reason: Change-Id I58b5caa7ab4673a70501d4c6c5c9aa04b3c53193 with SHA-1 fa47f645 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a83b7e53445daaf5aa0bb74d183bcaba3d30fed