Fix ringer not stopping when call is blacklisted.

We skipped quite a lot of post-call cleanup in the blacklist case,
including stopping the ringer. Because of that, it depended on the
timing of the first ring event and the disconnect event whether ringing
was correctly suppressed or whether the phone rang indefinitely.

Fix that by only skipping the steps that need to be skipped (mainly
adding the call log entry).

Change-Id: Iaa374e67913fed9893d2df88927048589a0c0aab
JIRA:CYAN-2131
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
Merge branch 'cm-10.1' into martincz
Merge branch 'jb-mr1_mkt' of git://github.com/MoKee/android_packages_apps_Phone into jb-mr1