Merge changes from topic "presubmit-am-f614a1e72f964e079bf97d0f1605f3e7" into sc-qpr1-dev am: dc7aaac3 am: 895c2817

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

Change-Id: Id3647acb80c6a59d146abb43ed819841c78b4bea