Merge "Update CTS tests to reflect ConnectivityManager API changes."