thermal: virtualtemp: update vt models with dvt and cuj data

- Update VT models trained with dvt and cuj data
- Use backup sensor during undersampling
- Remove battery thermistor from VT model prediction

Bug: 337512118
Bug: 338596757

Test: Build and boot on device. Check VT through dumpsys
adb shell dumpsys thermalservice

Change-Id: Id26238f7baf58e23ef5e1c771d2ee6cf8968ec8e
Signed-off-by: Sayanna Chandula <sayanna@google.com>

thermal/thermal_info_config_caiman.json

@@ -225,12 +225,12 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
             "Multiplier": 0.001,
             "PreviousSampleCount": 3,
             "OffsetThresholds" : [50000, 53000],
             "OffsetValues" : [500, 1000],
-            "SupportUnderSampling": true
+            "BackupSensor" : "VIRTUAL-SKIN-LEGACY"
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",

thermal/thermal_info_config_komodo.json

@@ -214,13 +214,13 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
             "Multiplier": 0.001,
             "Offset": 500,
             "PreviousSampleCount": 3,
             "OffsetThresholds" : [50000, 53000],
             "OffsetValues" : [500, 1000],
-            "SupportUnderSampling": true
+            "BackupSensor" : "VIRTUAL-SKIN-LEGACY"
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",

thermal/thermal_info_config_tokay.json

@@ -204,12 +204,12 @@
             "VirtualSensor": true,
             "ModelPath": "vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
-            "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
+            "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
             "Multiplier": 0.001,
             "PreviousSampleCount": 3,
             "OffsetThresholds" : [50000, 53000],
             "OffsetValues" : [500, 1000],
-            "SupportUnderSampling": true
+            "BackupSensor" : "VIRTUAL-SKIN-LEGACY"
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",