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

Change-Id: I753b9636a272a0d4f6a1025c9940663d8b65db4a