Merge changes from topic "am-8d2bac3e1a57449d917f1d95fa92d8ba" into udc-d1-dev-plus-aosp am: 1f4f7297

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



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