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

am skip reason: Change-Id I3609293f6885c1fc78685a7b37e0d1b7ad78eecd with SHA-1 c9c9597335 is in history

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

Change-Id: Iced55bdcaa19c788e11a56e799306536c8ea1711