Merge "Make UsageStats query API UserHandle-aware" into sc-dev