Merge "Fix drag and drop and resize freeform window broken on secondary...

Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc7 am: 37700810

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



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