[automerger skipped] Merge Android U (ab/10368041) am: 46c9fc18 -s ours am: 4c5e50ab -s ours

am skip reason: Merged-In I0b2d29fea8f947f0a73aae63258d0460241a9c8f with SHA-1 840b33e3 is already in history

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



Change-Id: I33248c4ebddd9e60b7b56707d04e0b2ff5f6cfae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>