[automerger skipped] Merge QQ3A.200605.002 into master am: 707f6715 -s ours...

[automerger skipped] Merge QQ3A.200605.002 into master am: 707f6715 -s ours am: 39189068 -s ours am: ff89dc4c -s ours am: 9b3a4cf7 -s ours am: fef675d5 -s ours

am skip reason: Change-Id I64840c10eb56a5932abe08370ff3b010106c56af with SHA-1 02ab278c is in history

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

Change-Id: I22e9cca2da1b74d507bd89f1981f998d33b7fa5b