Merge "UsageStats: Support event query with package filter" into main