[automerger skipped] Fix sync issue with handling display state changes am: 3b468eca -s ours

am skip reason: Merged-In I4798961551f78d75c45ead6dea5ebca895e5ef7d with SHA-1 878911f7 is already in history

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



Change-Id: I034b28e4bbcb53a76adc22c2bacf4d54c834bf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>