Merge commit '7595842' into merge2

Change-Id: I7e11e98e6d59562374195a8761d64a79dc0268e8

telecomm/java/android/telecom/InCallService.java

@@ -369,6 +369,11 @@ public abstract class InCallService extends Service {
          */
         public abstract void registerCallback(VideoCall.Callback callback);
 
+        /**
+         * Clears the video call listener set via {@link #setVideoCallListener(Listener)}.
+         */
+        public abstract void removeVideoCallListener();
+
         /**
          * Sets the camera to be used for video recording in a video call.
          *