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

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



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