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

Change-Id: I28b2eda8004c5807b454918f98542e098f9718d5