Merge "Move BatteryStatsInternal to services.jar"