[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b31fb9e3 am:...

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b31fb9e3 am: 45a28df6 am: bf4cb718 -s ours am: 2e5ec113 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6731b9b0080aedb261cfb9796a430d5a1c5d8871