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

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



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