Automatic translation import

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