Merge "Deprecate NetworkInfo"
am: 9f66465984

Change-Id: I4ac76b4bb3edb85e22440c8bfa4f0979c42c0cbd
tree: 5ac19adf4211452c64b85280fe74c86cecdcb97f
  1. core/
  2. services/
  3. tests/