Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-master am: 1dad44017b

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

Change-Id: Ic759b11e12c0ac3e086aad052fe5350c62cdef27