Merge "DO NOT MERGE: Fix sync issue with handling display state changes" into main am: 28205a393f

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

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