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

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

Change-Id: Iea7148b90144c2367813dc60dd11085be6ee250c