Merge "Revert "Update to use new ConnectivityManager API."" am: 9c7ddce334 am: 2105dc52dd
am: 11247ebb53

Change-Id: Id9a817cb440ce1ae538b7f6fd3f5c81a95efb346