Merge "Move UsageStatsManagerInternal to services.jar"