Merge commit '17455a3' into master_merge

telecomm/java/android/telecom/RemoteConnectionService.java

@@ -175,6 +175,13 @@ final class RemoteConnectionService {
             }
         }
 
+        @Override
+        public void setConferenceMergeFailed(String callId) {
+            // Nothing to do here.
+            // The event has already been handled and there is no state to update
+            // in the underlying connection or conference objects
+        }
+
         @Override
         public void addConferenceCall(
                 final String callId,