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

Change-Id: I15aa3b38af77c6e222db38b89e3f29562437f4dd