[automerger skipped] Merge "Merge redfin/bramble support." am: 28ba03fb28 -s ours am: 1408d2458f -s ours am: e68fadafaa -s ours

am skip reason: Change-Id I008e798c6abbb5d93334aaf8c0c6f4495d127ea3 with SHA-1 ee4cb8bbc9 is in history

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

Change-Id: I97faef229dfd2362a013be21f3f198840a402b4e