Merge "Do not handle VSync event during resolution switch" am: 03e4e9d9f5 am: 661fcfbcae am: 89d1093444

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

Change-Id: I34408bc66c18f63e8a34611d9625becc5a2f44f7