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

Change-Id: I936b30270a6e40d83469fb7cc528e94e49141c64