Merge changes from topic "am-570f291171f2406e87a9196e328158df" into tm-d1-dev-plus-aosp am: 7a9afc12

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



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