Merge "Add onBindClient for testing"

    method @NonNull public android.telecom.ConnectionRequest.Builder setVideoState(int);

  }

  public abstract class ConnectionService extends android.app.Service {

    method public void onBindClient(@Nullable android.content.Intent);

  }

}

package android.telephony {

import android.annotation.Nullable;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.Service;

import android.content.ComponentName;

import android.content.Intent;

    /** {@inheritDoc} */

    @Override

    public final IBinder onBind(Intent intent) {

        onBindClient(intent);

        return mBinder;

    }

        return super.onUnbind(intent);

    }

    /**

     * Used for testing to let the test suite know when the connection service has been bound.

     * @hide

     */

    @TestApi

    public void onBindClient(@Nullable Intent intent) {

    }

    /**

     * This can be used by telecom to either create a new outgoing conference call or attach