Merge "Fix drag surface may stuck in multi displays" into tm-dev am:...

Merge "Fix drag surface may stuck in multi displays" into tm-dev am: 02165220 am: ea93a195 am: 574e00a1

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



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