Merge "Fixes dumpstate crashed when shutdown the thread pool" am: 6fe1d3d3bb am: bb0e037a24

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

Change-Id: I79cc42333f9b8cc9d97ddc860fadd64a0ace8120