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

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

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

Change-Id: I07d7b4617635015d434b74ec4b27398e9c976ea1