[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am:...

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 9ad2a57d -s ours am: 015bb6b3 -s ours am: 9a801481 -s ours

am skip reason: Merged-In I43f3c33b45b8f3d9ac95d6d26e2cf9925d24ed9e with SHA-1 ff5ba76b is already in history

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

Change-Id: Ia65b4c7c168bd8025466929e31fcc2a6bd7138a6