Revert "pulling changes from aospa-legacy"

Reverts VentureROM-Legacy/android_packages_providers_TelephonyProvider#1