Merge "Merge "Add support to move task to another display" into udc-dev am: 3ad0e9fc am: 81252d03 am: 08b255b4" into udc-qpr-dev-plus-aosp am: c2ad8054

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



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