Merge "Deprecate getNetworkType"
am: d47ae01063

Change-Id: I1b0fa0da19df09fbf980074ea097f19698c02ba6