Merge "Remove getNetworkType() from ServiceState"