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

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



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