Merge "hwmon: qpnp-adc: modify qrd battery thermistor mapping table"