Merge changes from topic "presubmit-am-9151d0dceb2741f0b3d924304f0bc195" into sc-qpr1-dev am: a09605af am: 9166d5e4

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

Change-Id: Ib86a951243bb669f80120a69b49956c86f617eac