ServiceState merges voice and data into a single value

The voice and data is the same for operator name at ServiceState.
So ServiceState merges voice and data into a single value.
- merge the voice and data OperatorAlphaLong,OperatorAlphaShort, and
OperatorNumeric.

Bug: 144663018
Test: Build pass.
      atest NetworkControllerDataTest (PASS)
      atest ServiceStateTest (PASS)
      atest TelephonyMetricsTest (PASS)
      atest ServiceStateProviderTest (PASS)

Change-Id: I67e4a822c792bf9a9e174146ef8d65d9927d7612
Merged-In: I67e4a822c792bf9a9e174146ef8d65d9927d7612