Revert packages/providers/TelephonyProvider and hardware/ril