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

Merge changes from topic "VSyncDispatch_unregisterCallback" into udc-dev am: 6b567cad am: 8456f175

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



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