Merge changes from topic "presubmit-am-b8e581973eb74fad822fd692e9c201f8" into sc-qpr1-dev am: 934aaa94 am: 7eb928db

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

Change-Id: Ifd8c434c30ad17ea631944531f20f431aae7afd3