[automerger skipped] Merge cherrypicks of [15308469] into sparse-7502182-L70000000950343899 am: c4f08010 -s ours am: 59e53f98 -s ours

am skip reason: skipped by user baligh

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



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