Merge cherrypicks of [13538906] into mainline-documentsui-release am: 7cce3d23 am: 9567bd5a am: 97c8b2dd

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



Change-Id: Ibd9dcfe02e088fce04a45e6dc9943532ab7c329d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>