Merge 10952656 am: e8649b65a4

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

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