Merge "Revert "Update to use new ConnectivityManager API.""
am: 9c7ddce334

Change-Id: Icd2bf95c10716d324b47151fddc34a31f5736355