Merge changes from topic "presubmit-am-454d2f3acc204efa8c354465e9f413ba" into sc-qpr1-dev am: 995c46cd

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

Change-Id: I67a7adaf0d17397f745bbf6b9acd4910e9d44a6c