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