Merge "Remove internal listener when cloning" into oc-dev

am: a7dde34a81

Change-Id: Ieac61647ed17450141516473768b8881ecfa072b

core/java/android/animation/AnimatorSet.java

@@ -1346,6 +1346,8 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
         for (int n = 0; n < nodeCount; n++) {
             final Node node = mNodes.get(n);
             Node nodeClone = node.clone();
+            // Remove the old internal listener from the cloned child
+            nodeClone.mAnimation.removeListener(mDummyListener);
             clonesMap.put(node, nodeClone);
             anim.mNodes.add(nodeClone);
             anim.mNodeMap.put(nodeClone.mAnimation, nodeClone);