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

Change-Id: I4712f051f85511426af2207679224266ea0aa29e