Merge "Bug 5255124: Move cursor to the end of a word after correction popup alternates selection"

core/java/android/widget/TextView.java

@@ -9914,6 +9914,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                                     suggestionSpansFlags[i]);
                         }
                     }
+                    
+                    // Move cursor at the end of the replacement word
+                    Selection.setSelection(editable, spanEnd + lengthDifference);
                 }
             }
             hide();