Merge "Avoid deadlock in MessageQueue::onNewVsyncSchedule" into udc-dev am: 8c5541a6d4 am: ac2b152ab9

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

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