Merge "Remove some uses of deprecated BatteryStatsHelper"