Merge changes from topic "presubmit-am-61f75e942cc947eebfdda8eace7584c7" into tm-mainline-prod am: 966df1b6

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



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