Revert "pulling changes from aospa-legacy"

Reverts VentureROM-Legacy/android_packages_services_Telephony#1