Merge "Merge "Fix SystemServerInitThreadPool size on latest device." into qt-dev am: 746fbc30da am: a743d33338" into qt-r1-dev-plus-aosp
am: d9dd322d2d

Change-Id: Iae3ca41655767ed44502b610d964256eff85489c