Merge caf into Dialer fork ContactsProvider

Change-Id: Ic5f273c2678ea19c6cd5fc83d99c573d6f26d62e