Merge "Include all BatteryStatsTests in presubmit"