[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891"...

[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: e1b64ceb -s ours am: 01f6018c -s ours

am skip reason: Merged-In Ib7f4e692bb06d2ea4db2476809589f534ec283dd with SHA-1 2dbb39df is already in history

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

Change-Id: I6a1d88f3f60a50c7ff829904a7c794ac0b39fa2c