commit afd025f4ab339f9d952d8c2b1b2ed0a4ed1ed80c
author SongFerngWang <songferngwang@google.com> Wed Nov 20 02:11:09 2019 +0800
committer SongFerngWang <songferngwang@google.com> Thu Dec 12 22:10:04 2019 +0800
tree 6907d9d39e9168bf064a3762cdd20df642e817db
parent dd69aac761327e216b4f9396e4eb0412b830ea9b

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