Merge changes from topic "presubmit-am-afc5710695824db6bf82345697a3b63e" into sc-qpr1-dev am: 40a361be am: eeb2860a

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

Change-Id: I3535a858d88e8184cf9bafcf31f00a902741b8f8