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

Change-Id: Icf02af585e14047754c2e212dd0f24066eb027cb