Merge changes from topic "presubmit-am-79b97601db7243baac345bb732451c6f" into tm-mainline-prod am: 36f4992d

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



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