[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: 821a2a532d am: 35a782adf8 -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: I0b2615426ac23b2303c36d56c762e1129f5ec571