Merge "Fix subtle bug in disableHardwareVsync" into udc-dev am: 889c78e6

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



Change-Id: I95f3a3ceb8c8a41431e35b659332f4ef2887f79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>