Merge "New function signature for setResolverConfiguration"

        final String[] domainStrs = domains == null ? new String[0] : domains.split(" ");

        final int[] params = { sampleValidity, successThreshold, minSamples, maxSamples };

        final boolean useTls = false;

        final String tlsHostname = "";

        final String[] tlsFingerprints = new String[0];

        try {

            mNetdService.setResolverConfiguration(netId, servers, domainStrs, params);

            mNetdService.setResolverConfiguration(netId, servers, domainStrs, params,

                    useTls, tlsHostname, tlsFingerprints);

        } catch (RemoteException e) {

            throw new RuntimeException(e);

        }