Merge "ThermalManagerService: only update thermal status for SKIN type thermistor"