Merge "SF: fix a bug with DISPLAY_EVENT_MODE_CHANGE" into sc-v2-dev am: df63752e1d am: 5798347a52

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

Change-Id: Id92e10c0c7dcbfa8860400858accdc28c1397c5d