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

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

Change-Id: I9ff741dd575cfa3e9cf83861d31787c9d6a18310