Merge changes from topic "tc_change_23042206_46" into udc-dev am: 6d26443b am: ff005b94 am: 46005117

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



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