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

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

Change-Id: Ib89c472ecd3852be01f6a29c4b61c4645e985ec9