DO NOT MERGE: Fix sync issue with handling display state changes am: 9a4ec89429

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

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