Merge "More robust check around TelephonyManager init."