[automerger skipped] Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-master am: 1dad4401 am: fa9774ab -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1d86678c5592f21c5062dbafea2457353bbdc31e