Merge changes from topic "presubmit-am-2aa7bd3d6f334222a268533e130866fd" into sc-mainline-prod am: c1c977fb

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

Change-Id: Icf850a4f51676c6770117351576a646e32a4327c