Merge "vsyncId should always be incremental" into sc-dev am: 544b5f5b am: 0d504c13 am: 6c2d2433

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

Change-Id: I4582cb25087d25306c88c06f21ccb5b610413b9b