Merge changes from topic "presubmit-am-2eead652c2824143967c7945777e8c3d" into sc-qpr1-dev am: af9510bf am: 61776c1a

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

Change-Id: If26a99222a1ccd30051e1aa6457043177f6e47d6