[automerger skipped] Merge "SF: fix a bug with DISPLAY_EVENT_MODE_CHANGE" into sc-qpr1-dev am: 66a59c3e am: f819a558 -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: I1cb0362bcc747ade15a8269bf3dd8d34fc3fe31a