We have two sets of constants for network type. One used by the RIL can't be changed without big pains with OEM/Radio vendors. The other has been published as part of the framework and can't be easily changed either. Separate the two so it's clear where one should be used versus the other. bug:5717664 Change-Id: Ibf21f9165662e75557c7254fc9ad9a4870ba4af9