[automerger skipped] Merge redfin/bramble support. am: a5aa2e7d -s ours am:...

[automerger skipped] Merge redfin/bramble support. am: a5aa2e7d -s ours am: b888fa33 -s ours am: 2b762fb9 -s ours am: 1cef7f39 -s ours am: 8db6fd2c -s ours

am skip reason: Change-Id Ifab9c18c3b6adb2e874f3cd560646b734041c055 with SHA-1 3199abe4 is in history

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

Change-Id: I77ff67d1779baeb7049e966a34097907b3f64c79