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

Change-Id: I371f56959c9d1204022c37b67c8f821ed737297d