Merge "Fix drag and drop and resize freeform window broken on secondary display" into tm-dev am: d9543bc7 am: 0e2943e3 am: 06df86c7 am: 6abb4755

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



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