Merge "BatteryStatsHistory needs to public for unit test to work."