Merge "Remove RuntimeException throws from TelephonyManager" into pi-dev