Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84
am: 7edf405cdd

Change-Id: I0782f2db112fb1c0e404dc01e9a401268523ad39