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

Change-Id: I0b4b9ad545f2cebd9edd4adf3259ac34371bb79d