Merge 10952656 am: e8649b65a4 am: 79df022b00

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

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