Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev