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

Change-Id: Ib45dc4ad1276044fef31ff3c405187e3935897fe