Merge changes from topic "am-37f91336a8c44f648b31525d5f2b3a44" into tm-d1-dev-plus-aosp am: 9c4c0bda

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



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