Merge changes from topic "presubmit-am-aa9635a5cca34b62b554abab1bb81b7d" into sc-v2-dev-plus-aosp

* changes:
  [automerge] RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps 2p: 1ccb68a9fd
  RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps

src/com/android/launcher3/Launcher.java

@@ -989,6 +989,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         DiscoveryBounce.showForHomeIfNeeded(this);
         mAppWidgetHost.setActivityResumed(true);
+
+        // Temporary workaround for apps using SHOW_FORCED IME flag.
+        hideKeyboard();
     }
 
     private void logStopAndResume(boolean isResume) {