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

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



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