Merge "Removed data and voice RAT from service state"
am: ced4a31769

Change-Id: I2ef8a5d4647d404d5b782e78c8ab2613f6466f92