Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev automerge: 4255ec5

automerge: 0bfb97c

* commit '0bfb97cddfadcc0d580bca78c4368efac4edd23e':
  Support disconnecting conference participants from conference.

telecomm/java/android/telecom/Connection.java

@@ -973,6 +973,15 @@ public abstract class Connection {
      */
     public void onDisconnect() {}
 
+    /**
+     * Notifies this Connection of a request to disconnect a participant of the conference managed
+     * by the connection.
+     *
+     * @param endpoint the {@link Uri} of the participant to disconnect.
+     * @hide
+     */
+    public void onDisconnectConferenceParticipant(Uri endpoint) {}
+
     /**
      * Notifies this Connection of a request to separate from its parent conference.
      */