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

Merge "[WMS][Bugfix] Fix hang when dumping local window." am: 635ddd9c am: 31384ef9 am: 752ed842

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



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