Merge "Revert "TelephonyManager System APIs process""