Merge "Merge "Fix SystemServerInitThreadPool size on latest device." into qt-dev am: 746fbc30da am: 7f70b3f2e9" into qt-r1-dev-plus-aosp
am: 580417a3f5

Change-Id: Ic16c47927005521feb7dd1adf480951497e297d5