Adjust the data order of battery EEPROM atom

Bug: 160202146
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: I5b0fa38214a0eacd667afe10d1b7238e660df596
(cherry picked from commit 7f266c04ad025f7b333ff5246695279318f50289)
diff --git a/pixelstats/BatteryEEPROMReporter.cpp b/pixelstats/BatteryEEPROMReporter.cpp
index 8bbfcf1..ab0280d 100644
--- a/pixelstats/BatteryEEPROMReporter.cpp
+++ b/pixelstats/BatteryEEPROMReporter.cpp
@@ -76,10 +76,10 @@
                    "%2" SCNx8 "%2" SCNx8 " %4" SCNx16 "%4" SCNx16
                    "%4" SCNx16 "%4" SCNx16 "%4" SCNx16,
                    &hist.cycle_cnt, &hist.full_cap, &hist.esr,
-                   &hist.rslow, &hist.soh, &hist.batt_temp,
-                   &hist.cutoff_soc, &hist.cc_soc, &hist.sys_soc,
-                   &hist.msoc, &hist.batt_soc, &hist.reserve,
-                   &hist.max_temp, &hist.min_temp, &hist.max_vbatt,
+                   &hist.rslow, &hist.batt_temp, &hist.soh,
+                   &hist.cc_soc, &hist.cutoff_soc, &hist.msoc,
+                   &hist.sys_soc, &hist.reserve, &hist.batt_soc,
+                   &hist.min_temp, &hist.max_temp,  &hist.max_vbatt,
                    &hist.min_vbatt, &hist.max_ibatt, &hist.min_ibatt,
                    &hist.checksum);
 
@@ -187,7 +187,7 @@
        val.intValue(hist.max_vbatt);
        values[BatteryEEPROM::kMaxVbattFieldNumber - kVendorAtomOffset] = val;
        val.intValue(hist.min_vbatt);
-       values[BatteryEEPROM::kMinTempFieldNumber - kVendorAtomOffset] = val;
+       values[BatteryEEPROM::kMinVbattFieldNumber - kVendorAtomOffset] = val;
        val.intValue(hist.max_ibatt);
        values[BatteryEEPROM::kMaxIbattFieldNumber - kVendorAtomOffset] = val;
        val.intValue(hist.min_ibatt);