Merge "ServiceState merges voice and data into a single value" am: 72f579d5f2 am: 4b108f74f6

Change-Id: Ia68eb336d8b916cb93b83ba14b6423560f29a42d