Merge "Add intdef for Telephony network type constants" am: 544b8efa46 am: 89ec00b622
am: fd56736cd4

Change-Id: Iedc8dd998083161c552089807f58504046c44bd2