Merge changes from topic "presubmit-am-afc5710695824db6bf82345697a3b63e" into sc-dev-plus-aosp am: d6ebd733 am: 3902ad14

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

Change-Id: Ic85f2ec933f938d6438748582e9fc062548587aa