Merge "SF: fix a bug with DISPLAY_EVENT_MODE_CHANGE" into sc-qpr1-dev am: 66a59c3ebf

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

Change-Id: I49aab7ffd82303c17a0cbb1bd2c8a74c33612394