merge fix
Merge github.com:ResurrectionRemix/android_packages_services_Telephony into kitkat1