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

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

Change-Id: If8a085c2e88386527044eeb0af9ac89fa09258d7