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

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

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