Merge changes from topic "presubmit-am-63407a8e860442989bf36a3cf0b42ec7" into tm-mainline-prod am: 824d425b

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



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