Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aosp am: 1888c194 am: f2c8385b

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



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