Merge "Fix com.android.server.wm.TaskFpsCallbackController#unregisterListener method NEVER works"