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

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

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