Merge "Reland "Disallow shrinking threadpool size once started."" am: 0d4dfb1c9b am: 833b6bd5df

Change-Id: Ic18e54170e4ded7873376943aabb2d87f094945c