Merge "Deprecate most of NetworkInfo." am: 92a9847de9
am: c8b846e1ac

Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1