Merge changes from topic "tc_change_23022712_26" into udc-dev am: 69cb8691

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



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