Merge changes from topic "am-dddab5aa66a34c29a56655e9be0a2f79" into...

Merge changes from topic "am-dddab5aa66a34c29a56655e9be0a2f79" into udc-qpr-dev-plus-aosp am: 1e41f07a

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



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