Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo