Merge changes from topic "presubmit-am-61f75e942cc947eebfdda8eace7584c7" into...

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

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



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