Merge changes from topic "presubmit-am-196349f6d992411bb2e43461f2f0acaa" into tm-mainline-prod

* changes:
  [automerge] Start a visible requested activity if still in initializing state 2p: bf81060ff5
  Start a visible requested activity if still in initializing state

services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java

@@ -244,7 +244,7 @@ class EnsureActivitiesVisibleHelper {
         // invisible. If the app is already visible, it must have died while it was visible. In this
         // case, we'll show the dead window but will not restart the app. Otherwise we could end up
         // thrashing.
-        if (!isTop && r.mVisibleRequested) {
+        if (!isTop && r.mVisibleRequested && !r.isState(INITIALIZING)) {
             return;
         }