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

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

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



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