Merge changes from topic "presubmit-am-2482e9bf6e484392a8fcdeb738793b96" into sc-qpr1-dev am: dc936c33 am: eaa2e3fc am: 46e98f4f

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

Change-Id: If982002d1fd38e3ac797508b6e22c7e271f5630e