[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE...

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: a4f45718 am: f8a1f1f6 -s ours am: 952d6bf1 -s ours am: fd68249d -s ours

am skip reason: Change-Id I2663eb14a4dfaab5dd62160a0b20bb028b8532f9 with SHA-1 8db269cc is in history

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

Change-Id: I7ca8e6df997cdde9520598fdbea49f1a2c77cbd6