Automatic translation import

Change-Id: I8d9cefaa24947b2b6e008f2e9bb953bbadea1578
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge https://github.com/cristianomatos/android_packages_services_Telephony into HEAD