Merge changes from topic "presubmit-am-2eead652c2824143967c7945777e8c3d" into sc-qpr1-dev am: af9510bf14

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

Change-Id: I99909bf477f3c1a72caae58f123fa3ae40b71bc0