Automatic translation import

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