Merge "Fix com.android.server.wm.TaskFpsCallbackController#unregisterListener...

Merge "Fix com.android.server.wm.TaskFpsCallbackController#unregisterListener method NEVER works" am: 4b755813 am: d18d95e0 am: f492f15c am: de4c4363 am: d7bf6c01

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191395



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