Fix for multiple merge problem.

Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4

core/java/android/widget/TextView.java

@@ -8246,9 +8246,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         }
 
         @Override
-        public void onDetached() {
+        public void onDetached() {}
-            removeCallbacks(mHider);
-        }
     }
 
     private void hideInsertionPointCursorController() {