Merge "Use TelephonyManager instead of ITelephony Binder"