Merge "ServiceState merges voice and data into a single value"
am: 63c973ceff

Change-Id: Idbcbc82f01818c787259306921cb71566c8dc0cb