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

Change-Id: I5430078a3085443e09d305bef91f039511183bf3