Merge "Fix WM shell crash when targets belong to a different display." into...

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

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



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