InCallUI: Cleanup CAF additions

Change-Id: Ic747202eee89165c540407ad46dd1be50afff559
Merge branch 'cm-11.0' into kk_mkt