Merge "statsd: Add BatteryCycleCount atom"