Track PA's own TelephonyProvider & ContactsCommon

Help with the new CM commits that have broke a lot of things