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

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

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