Merge branch 'kitkat' of github.com:AOSPA/android_packages_services_telephony into kitkat