Merge "Change UsageStatsService to check uses-permission" into lmp-dev