Merge "[WMS][Bugfix] Fix hang when dumping local window." am: 635ddd9c70

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

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