Revert "Revert "track own ContactsProvider""

This reverts commit 06187847b18a886266747ff875dd89f9b2a33121.
Merge github.com:ResurrectionRemix/platform_manifest into kitkat1