Revert "pulling major changes from aospal"

Reverts VentureROM-Legacy/android_packages_services_Telephony#3

Undoing change to telephony in attempt to undo a bork during build, will recommit following upstream changes