Merge "Pixel Thermal Throttling: fix throttling constants." into pi-dev