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

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

Change-Id: If7ec8a47b1ee75dd59a4a37464c44d67e59e42b4