Merge "Store desktop tasks per display id" into udc-dev am: 2238fdb8 am:...

Merge "Store desktop tasks per display id" into udc-dev am: 2238fdb8 am: 7f516877 am: 92873cb6

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



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