Merge "Revert "TelephonyManager System APIs process"" into pi-dev