Merge changes from topic "presubmit-am-61f75e942cc947eebfdda8eace7584c7" into tm-dev am: f5061ce4

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



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