Merge "Skip task snapshot if display has not been enabled" into sc-dev am: c8bbb99a44 am: c80d3b7989

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

Change-Id: Ib1f1f5970320118220849baf37ab44a542789eb0

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

@@ -644,7 +644,7 @@ class TaskSnapshotController {
 
     /** Called when the device is going to sleep (e.g. screen off, AOD without screen off). */
     void snapshotForSleeping(int displayId) {
-        if (shouldDisableSnapshots()) {
+        if (shouldDisableSnapshots() || !mService.mDisplayEnabled) {
             return;
         }
         final DisplayContent displayContent = mService.mRoot.getDisplayContent(displayId);