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 am: 3d2fdf9c

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



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