Merge "Revert "UsageStats: New event query API with specific event types."" into main