Merge changes from topic "VSyncDispatch_unregisterCallback" into udc-dev am:...

Merge changes from topic "VSyncDispatch_unregisterCallback" into udc-dev am: 6b567cad am: c6926a24 am: 2f1ae380

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



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