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

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

Change-Id: I0bc3098a907151d44ea87e07dafaedfa100263f9