Dialer: Cleanup CAF additions 

Change-Id: I25cad862b009b75d332ece9a53bdcefdb75c0e11
Merge "Dialer: Cleanup CAF additions " into cm-11.0