Merge tm-dev-plus-aosp-without-vendor@8763363

Bug: 236760014
Merged-In: Ie962b5ff821f166d79323474bc6fad66d930e8fa
Change-Id: If6a2b297523fde8d1556ccbca7f854a0398509d3
diff --git a/drm/VSyncWorker.cpp b/drm/VSyncWorker.cpp
index 8cb4d08..ed41189 100644
--- a/drm/VSyncWorker.cpp
+++ b/drm/VSyncWorker.cpp
@@ -92,7 +92,7 @@
   vsync.tv_nsec = int(phased_timestamp - (vsync.tv_sec * kOneSecondNs));
   do {
     ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &vsync, nullptr);
-  } while (ret == -1 && errno == EINTR);
+  } while (ret == EINTR);
   if (ret)
     return ret;