Merge "Don't intercept above shelf progress if still animating" into ub-launcher3-edmonton-polish

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

@@ -86,7 +86,7 @@ public abstract class AbstractStateChangeTouchController
     private boolean mCanBlockFling;
     private FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck();
 
-    private AnimatorSet mAtomicAnim;
+    protected AnimatorSet mAtomicAnim;
     // True if we want to resume playing atomic components when mAtomicAnim completes.
     private boolean mScheduleResumeAtomicComponent;
     private AutoPlayAtomicAnimationInfo mAtomicAnimAutoPlayInfo;