Merge "Clean new TelephonyManager API." into pi-dev