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

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

Change-Id: I65ae8da429a12380143ffc18281e6c58f2be770d