Merge "Avoid deadlock in EventThread::onNewVsyncSchedule" into udc-dev am: e6cfeaad1f

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

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