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

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



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