[automerger skipped] Merge Android 12 am: 8c348c41a5 -s ours am: 6730834b21 -s ours

am skip reason: Merged-In I64e7be8bd815a3f3bf84277ffb9ea801a5dceb24 with SHA-1 84af7ecf6a is already in history

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

Change-Id: I56de16e9d9425b3e884ce843c0b582329083c880