Merge "Fix com.android.server.wm.TaskFpsCallbackController#unregisterListener method NEVER works" am: 4b755813d9

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

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