Merge changes from topic "am-340505ec150944a9b88ef5fcec38b52a" into...

Merge changes from topic "am-340505ec150944a9b88ef5fcec38b52a" into udc-d1-dev-plus-aosp am: 2bc30944 am: 08b473f5

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



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