Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
am: 8dc06d90ea

Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
tree: a922d3bb437eb7e88412d9fb826b7832b5634007
  1. core/
  2. services/
  3. tests/