Merge "Fix WM shell crash when targets belong to a different display." into tm-qpr-dev am: d002c621c2

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

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