[automerger skipped] Merge "Merge redfin/bramble support." am: 0190f446ce -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: I03d232bc3736f83bbe2da9d3bd9279972e6b3573