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

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



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