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

am skip reason: subject contains skip directive

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

Change-Id: Id941adbdeb83942f9cec76b38d576586dba311bc