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

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

Change-Id: I44ee5a03e5c7cb23ada3146b88978efb7c3214a5