Merge "Fix the logics in ImeFocusController#onPostWindowFocus" into rvc-dev

core/java/android/view/ImeFocusController.java

@@ -123,7 +123,7 @@ public final class ImeFocusController {
         }
         // Update mNextServedView when focusedView changed.
         final View viewForWindowFocus = focusedView != null ? focusedView : mViewRootImpl.mView;
-        onViewFocusChanged(viewForWindowFocus, true);
+        onViewFocusChanged(viewForWindowFocus, viewForWindowFocus.hasFocus());
 
         immDelegate.startInputAsyncOnWindowFocusGain(viewForWindowFocus,
                 windowAttribute.softInputMode, windowAttribute.flags, forceFocus);