Moved android_packages_services_telephony upstream