Merge changes from topic "presubmit-am-6e2296e7937a412dae65685e32400f77" into sc-dev-plus-aosp am: e8594c6d

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

Change-Id: I6e63178e6f1c3d9dbac5d9741c545e4f8fa7e4c5