Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant" am: 23019528ec am: a4c3162339

Change-Id: I263fbd69be70ccf48b0e16d00985e716060f6bfa