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

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

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

Change-Id: Ib19a42ce31792b1f712aec6bcd387fab31501b35