[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: bef887cb -s ours am: 8db269cc -s ours am: d4907d9c -s ours am: c18d7d83 -s ours am: 81332dc1 -s ours

am skip reason: Change-Id I65bfe7899e049e348011130b21972149e3a5600f with SHA-1 988c382b is in history

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

Change-Id: I53b7e981501204519b8e54e85f7960c3f5fc22ec