Merge changes from topic "tc_change_23050307_53" into udc-dev-plus-aosp am: 75537162 am: 42f091a4 am: d4d1a223

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



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