Telephony: Cleanup CAF additions

Change-Id: I87d334ce3f72c55ae71a7ab5adce7c7d2cb769e1
Merge "Telephony: Cleanup CAF additions" into cm-11.0