Automatic translation import

Change-Id: Idf6b6417770c5e958981f0e34a986aaae34b9f0e
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