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

Change-Id: If5c714452e56f76bf6f9629444469fda2d45be93