Merge "BatteryStats: Fix bogus calls to addHistoryRecordLocked."