m7-common: Update thermald config

Change-Id: Ic9db2898ca6d26b85fefbee4b97866cf79ae52be
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	configs/thermald.conf

Change-Id: I4e23a6b79d2473b1acd581078d34b2369e6e1a01