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

Change-Id: I41b4f42c88895dd26a65fe0c92b71dbe1e7a3c08