[automerger skipped] Merge "ServiceState merges voice and data into a single...
[automerger skipped] Merge "ServiceState merges voice and data into a single value" am: 333ab184 am: 954842d5 am: ed26614b -s ours
am skip reason: Change-Id I5415774951f1da190bf67e717e91955b919fbc1e with SHA-1 7f9f43d3 is in history
Change-Id: Ib206a8c5871d37990345261566020702598fd91e