Merge "TelephonyManager should use TelecomManager's getCallState()." into mnc-dev