Track Telephony Provider from our fork

This plus a revert in the forked repo fixes some errors about the blacklist feature for numbers (that need other stuffs for storing the option in both contact app and call log). Having only the option in the phone app is fine :)
Merge remote-tracking branch 'upstream/jellybean' into jellybean