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

Change-Id: I8e09f9060c7066e99428ea395743f66924443488