Merge branch 'jb43-legacy' of https://github.com/ParanoidAndroid/android_packages_providers_TelephonyProvider into jb4.3
Merge branch 'jb4.3' of github.com:RemixPA/android_packages_providers_TelephonyProvider into jb4.3