Merge "Do not use default to get TelephonyManager" am: 99f6957f2e
am: c175a8ac85

Change-Id: I22680dfba0155e9cf8b6cad0b0aed8655930f2c0