Merge "Deprecate most of NetworkInfo."
am: 58ae164c97

Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1
tree: e9aea26ee14052af48e1fc5ae6c91f2f96bf7346
  1. core/
  2. services/
  3. tests/