[automerger skipped] Merge "Do not handle VSync event during resolution...

[automerger skipped] Merge "Do not handle VSync event during resolution switch" am: 03e4e9d9 am: 661fcfbc am: 89d10934 am: 747e5f77 -s ours

am skip reason: Merged-In Ide53b0e5cff3b569593a2ed388d0ea66e0002e9d with SHA-1 087d3748 is already in history

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

Change-Id: I25a5fa413b2964e79a67be54dd7537d7cadccb3b