Merge "Fix selection expansion detection logic."

diff --cc core/java/android/widget/Editor.java
Simple merge

diff --cc core/tests/coretests/src/android/widget/TextViewActivityTest.java
index 2c67743,a6250e6..aa57641
--- 1/core/tests/coretests/src/android/widget/TextViewActivityTest.java
--- 2/core/tests/coretests/src/android/widget/TextViewActivityTest.java
+++ b/core/tests/coretests/src/android/widget/TextViewActivityTest.java
@@@ -31,8 -29,12 +31,9 @@@ import static android.widget.espresso.F
  import static android.support.test.espresso.Espresso.onView;
  import static android.support.test.espresso.action.ViewActions.click;
  import static android.support.test.espresso.action.ViewActions.pressKey;
+ import static android.support.test.espresso.action.ViewActions.replaceText;
  import static android.support.test.espresso.action.ViewActions.typeTextIntoFocusedView;
  import static android.support.test.espresso.assertion.ViewAssertions.matches;
 -import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
 -import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
 -import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
  import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
  import static android.support.test.espresso.matcher.ViewMatchers.withId;
  import static android.support.test.espresso.matcher.ViewMatchers.withText;