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: f133118f am: 23e0745e

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



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