Merge "Resume stopped preserved window when relaunching visible activity" into udc-dev am: 5d0abd461b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21472527

Change-Id: I753c408c755769b8a252e8e43b83117236b1679c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/view/ViewRootImpl.java

@@ -1135,6 +1135,10 @@ public final class ViewRootImpl implements ViewParent,
         updateLastConfigurationFromResources(getConfiguration());
         // Make sure to report the completion of draw for relaunch with preserved window.
         reportNextDraw("rebuilt");
+        // Make sure to resume this root view when relaunching its host activity which was stopped.
+        if (mStopped && getHostVisibility() != View.GONE) {
+            setWindowStopped(false);
+        }
     }
 
     private Configuration getConfiguration() {