Merge "Merge "Add ability to get tasks per displayId" into tm-qpr-dev am:...

Merge "Merge "Add ability to get tasks per displayId" into tm-qpr-dev am: 179ba8d0" into tm-qpr-dev-plus-aosp am: afa1ef56

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



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