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: Iee651c9f54bb4f35cf2937d13bb49b344bd0d9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>