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

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



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