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 ServiceStateTest (PASS)
      atest ServiceStateProviderTest (PASS)

Change-Id: Iecc312a95dccd444d3f87ac8a25d6881745a17c4
2 files changed