Merge "Use TelephonyManagerShim factory method"