Merge changes Idfb5e149,Ia52b24c5

* changes:
  Stop using NetworkState internally in ConnectivityService.
  Isolate an ad-hoc legacy API codepath.
tree: d4d63e7c347a1d51d635f0fa2208452748b2801f
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS