Merge "Add a new method queryEventsForUser() to UsageStatsManagerInternal for People Service to call"