Merge "Fixed when SystemServerInitThreadPool.shutdown() is called." into rvc-dev am: 3ce5a9b85b am: 6089aac5c4

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

Change-Id: I06f14822b380d8e0f895506139a164023f1c53c9