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

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



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