Merge "Fix thermalservice crash on ThermalHAL 1.1"