Store phone blacklist in content provider (1/4)

Change-Id: I9dafdb3e10bd2a71695c2a02cc483c594d86c543
Merge "Store phone blacklist in content provider (1/4)" into cm-10.1
Merge branch 'cm-10.1.1' into martincz
Revert "PhoneProxy: when using v6 or greater ril make sure current phone type isnt GSM"

This reverts commit 5e0983ba3e96083da094d9706beadacce6b4e9c9.

Change-Id: I1d3727a5ac315309c1ce7aae4fa1d0662984432f
Merge "Revert "PhoneProxy: when using v6 or greater ril make sure current phone type isnt GSM"" into cm-10.1
Merge branch 'cm-10.1.1' into martincz