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

Change-Id: Iae9ffa2d0c97ad3035a7594ea071b78a8ec1944e