Merge changes from topic "presubmit-am-8961fd3623aa4d34b94d6601c0826c97" into sc-qpr1-dev am: 26da0658

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

Change-Id: I1825fadb7abff98dcba303aa8ed09e840fabd07f