Merge "Add intdef for Telephony network type constants"