Merge changes from topic "presubmit-am-2482e9bf6e484392a8fcdeb738793b96" into sc-qpr1-dev am: dc936c33

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

Change-Id: I0e40954117555fd2e5377b00a553e77c2848d89b