Merge "Update to use new ConnectivityManager API."
am: 70b1830e7e

Change-Id: Ide228930858fc8eccfac060858b0da86725f229a