Merge "Change onTaskInfoChanged to only use display id from task info." into tm-qpr-dev am: b800957966

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

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