Merge changes from topic "presubmit-am-f614a1e72f964e079bf97d0f1605f3e7" into sc-qpr1-dev am: dc7aaac3b9

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

Change-Id: Id7f488e57c8c0f27393a7df07c39f214012981d7