Adjust animation batch numbers to be consistent when controlled by native

Summary:
D27682424 (https://github.com/facebook/react-native/commit/ea1ff374de2ece7d1698b14d4e1aa8075df22cdd) updated how animated node batches are executed in Fabric. On Paper, these batches were controlled by native module in some places (batch was executed ~every 2 frames), but some animations were switching animation batching control to JS globally there as well.

This change updates two things:
- If batching is controlled by native, it makes sure batches are calculated correctly.
- At the same time, this change switches control for animation node batching to JS, aligning it with Fabric.

Changelog: [Internal]

Reviewed By: JoshuaGross, mdvacca

Differential Revision: D27939659

fbshipit-source-id: d6251bce2a303a4a007dc10297edc0175cc4b348

ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java

@@ -174,7 +174,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
   }
 
   private void addOperation(UIThreadOperation operation) {
-    operation.setBatchNumber(mIsInBatch ? mCurrentBatchNumber : -1);
+    operation.setBatchNumber(getCurrentBatchNumber());
     mOperations.add(operation);
   }
 
@@ -184,7 +184,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
   }
 
   private void addPreOperation(UIThreadOperation operation) {
-    operation.setBatchNumber(mIsInBatch ? mCurrentBatchNumber : -1);
+    operation.setBatchNumber(getCurrentBatchNumber());
     mPreOperations.add(operation);
   }
 
@@ -342,6 +342,13 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
             ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE, mAnimatedFrameCallback);
   }
 
+  private long getCurrentBatchNumber() {
+    if (mBatchingControlledByJS && !mIsInBatch) {
+      return -1;
+    }
+    return mCurrentBatchNumber;
+  }
+
   @VisibleForTesting
   public void setNodesManager(NativeAnimatedNodesManager nodesManager) {
     mNodesManager.set(nodesManager);
@@ -426,6 +433,9 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
 
   @Override
   public void startOperationBatch() {
+    if (ANIMATED_MODULE_DEBUG) {
+      FLog.d(NAME, "Start JS operation batch " + mCurrentBatchNumber);
+    }
     mBatchingControlledByJS = true;
     mIsInBatch = true;
     mCurrentBatchNumber++;
@@ -433,6 +443,9 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec
 
   @Override
   public void finishOperationBatch() {
+    if (ANIMATED_MODULE_DEBUG) {
+      FLog.d(NAME, "Finish JS operation batch " + mCurrentBatchNumber);
+    }
     mBatchingControlledByJS = true;
     mIsInBatch = false;
     mCurrentBatchNumber++;