Merge "Add is_uid annotation to app_usage_event_occurred"