[automerger skipped] DO NOT MERGE: Fix sync issue with handling display state changes am: 9a4ec894 am: aa4f379e -s ours

am skip reason: contains skip directive

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



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