Snap for 7478028 from fb60f8f8 to...

Snap for 7478028 from fb60f8f8 to mainline-documentsui-release am: e8073383 am: 2200f9f7

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



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