[automerger skipped] Merge "Merge redfin/bramble support." am: 0190f446ce -s ours am: 9dce6448a4 -s ours am: f5700c45ea -s ours am: b492c827a3 -s ours

am skip reason: Change-Id I010c019b17b80d4f3a65aceedfd530ddbfbd2952 with SHA-1 f61012ace4 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1466405

Change-Id: Iae27a3699d5a6a3fbb7c1be9cc80944488abd7b5