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

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

Change-Id: Iac863c4893978207919f4f39155a1e0e5a7ec16a