Merge changes from topic "am-93ebdb9c83cd4ab99a7cb222f03a27b2" into...

Merge changes from topic "am-93ebdb9c83cd4ab99a7cb222f03a27b2" into udc-d1-dev-plus-aosp am: 1e4af32f am: 495da692

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



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