Telephony: Improve latest CAF strings

Change-Id: I193bc8f56eeced113cce6c73edf24be76d42fa94
Merge remote-tracking branch 'cm/cm-11.0' into HEAD