Merge "Add support to move task to another display" into udc-dev am: 3ad0e9fc5f am: 5a3cb71041

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

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