Merge "BatteryStats: Remove empty conditional."