Merge cherrypicks of [13538906] into mainline-documentsui-release am: 7cce3d23 am: 002d2255 am: 761eff7a

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



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