Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into...

Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 4815b4aa

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



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