Automatic translation import

Change-Id: I6a01d44ebc49d936f6400f637f06c1a4c0fdd667
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_services_Telephony into cm-11.0
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_services_Telephony into HEAD