[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: 8df7c1ca -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8b7c97f437cacd2b258a3f516daab9ee934d5548