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

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



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