Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aosp am: c5c038de

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



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