Merge changes from topic "am-44884482f39c4e5bb8e97e19df49f3d8" into...

Merge changes from topic "am-44884482f39c4e5bb8e97e19df49f3d8" into tm-qpr-dev-plus-aosp am: ea01058c

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



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