Merge "Fix cannot open archive file from external storage. am: f4f1e724 am:...

Merge "Fix cannot open archive file from external storage. am: f4f1e724 am: 68e75358 am: 39d30fd0" into rvc-qpr-dev-plus-aosp am: 99d06fdf

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

Change-Id: I99f17abaf2ae5716559b72d8c25337fdb446e0c7