Merge \"ConnectivityManager: no double callback remove\" into nyc-mr1-dev

            throw new IllegalArgumentException("Invalid NetworkCallback");

        }

        try {

            // CallbackHandler will release callback when receiving CALLBACK_RELEASED.

            mService.releaseNetworkRequest(networkCallback.networkRequest);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        synchronized (sNetworkCallback) {

            sNetworkCallback.remove(networkCallback.networkRequest);

        }

    }

    /**