Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc7 am: 0e2943e3 am: df154bb7 am: 046853b9

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



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