Merge "Fix notifyTaskDisplayChanged is called every time onDisplayChanged is triggered." into main am: a1642b8648 am: 561345dda1

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

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