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

Change-Id: I2abea53dc69ca2f49eeb17da040919d0d600917c