tree 9c52d9c1bcb8ab530bae738438abde986a3a764f
parent 711f5d52d82ba4c467ef0b65f2f0c0f435a72622
author SongFerngWang <songferngwang@google.com> 1574190246 +0800
committer SongFerngWang <songferngwang@google.com> 1575298205 +0800

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