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