Merge changes from topic "presubmit-am-2eead652c2824143967c7945777e8c3d" into sc-dev-plus-aosp am: 6deb29bd am: 8991e31a

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

Change-Id: Ic99b59317f1fc2c2e947399fd8ee003175ee89ad