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

Change-Id: I95d0f9f62b4b9597cef50b1d8a9e23df09831720