[automerger skipped] Merge "SF: fix a bug with DISPLAY_EVENT_MODE_CHANGE" into...

[automerger skipped] Merge "SF: fix a bug with DISPLAY_EVENT_MODE_CHANGE" into sc-qpr1-dev am: 66a59c3e -s ours am: cf84e42c -s ours am: 4426c1d8 -s ours

am skip reason: Merged-In Icf44e0fb6aadb76e629cd408907389e2626d2047 with SHA-1 d1591701 is already in history

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

Change-Id: I92f2967a84d05a2c65647cd48ca0e9246f61cb0d