Merge "Keeps the served view of the window when focus to the next window" into rvc-dev am: 6e9ee1c78f

Change-Id: Ie1466e718a9dadb008120d515f2b7523625f3587

core/java/android/view/inputmethod/InputMethodManager.java

@@ -645,11 +645,6 @@ public final class InputMethodManager {
         @Override
         public void setCurrentRootView(ViewRootImpl rootView) {
             synchronized (mH) {
-                if (mCurRootView != null) {
-                    // Reset the last served view and restart window focus state of the root view.
-                    mCurRootView.getImeFocusController().setServedView(null);
-                    mRestartOnNextWindowFocus = true;
-                }
                 mCurRootView = rootView;
             }
         }