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

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



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