Merge "thermal-hal: update cpu, vbat and socd sensor configurations for khaje"