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

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



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