[automerger skipped] Merge "DO NOT MERGE: Fix sync issue with handling display...

[automerger skipped] Merge "DO NOT MERGE: Fix sync issue with handling display state changes" into main am: 28205a39 am: 259941bd -s ours

am skip reason: contains skip directive

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



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