Merge "Deprecate most of NetworkInfo." am: 12c57e795c
am: 94d7da3a7c

Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1
tree: 988e4bfb2a926071d7678e638ea83e3ff5df9be6
  1. core/
  2. services/
  3. tests/