Merge "Skip task snapshot if display has not been enabled" into sc-dev

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);