Fix ClassCastException on disconnect for blacklisted calls.

E AndroidRuntime: java.lang.ClassCastException: java.lang.String cannot be cast to com.android.phone.PhoneUtils$CallerInfoToken
E AndroidRuntime: 	at com.android.phone.CallNotifier.getCallerInfoFromConnection(CallNotifier.java:2372)
E AndroidRuntime: 	at com.android.phone.CallNotifier.onDisconnect(CallNotifier.java:1313)
E AndroidRuntime: 	at com.android.phone.CallNotifier.handleMessage(CallNotifier.java:324)
E AndroidRuntime: 	at android.os.Handler.dispatchMessage(Handler.java:99)
E AndroidRuntime: 	at android.os.Looper.loop(Looper.java:137)
E AndroidRuntime: 	at android.app.ActivityThread.main(ActivityThread.java:5227)
E AndroidRuntime: 	at java.lang.reflect.Method.invokeNative(Native Method)
E AndroidRuntime: 	at java.lang.reflect.Method.invoke(Method.java:511)
E AndroidRuntime: 	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:795)
E AndroidRuntime: 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:562)
E AndroidRuntime: 	at dalvik.system.NativeStart.main(Native Method)

JIRA:CYAN-2204
Change-Id: Iedb3f0a8e6c0852472508e64baf005044d4b7ee1
Store phone blacklist in content provider (4/4)

Change-Id: Id5f35132e66e74215158929fae0fe0276e7ba010

Conflicts:
	src/com/android/phone/Blacklist.java
	src/com/android/phone/PhoneGlobals.java