Merge "Add generic "INTERACTION" event type to UsageStatsManager"