Merge "Ensure deferred cleanup when display is off" am: 5cc75e347f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1952223

Change-Id: I86f3d6e81b285e4c79866cd14f04845df1d0e357
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index fabb3fe..893dc2a 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2410,6 +2410,7 @@
     mTimeStats->recordDisplayEventConnectionCount(sfConnections + appConnections);
 
     if (isDisplayConnected && !display->isPoweredOn()) {
+        getRenderEngine().cleanupPostRender();
         return;
     }