Merge changes from topic "presubmit-am-9151d0dceb2741f0b3d924304f0bc195" into...

Merge changes from topic "presubmit-am-9151d0dceb2741f0b3d924304f0bc195" into sc-dev-plus-aosp am: 481c8071 am: 311715b9 am: 686c6e2d

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

Change-Id: I0d286906910bb2f9ff040f330690b9587acf180b