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: e8e7bd04 am: c2e06a25 am: c527ea7d

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



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