Merge "Add new MetricsEvent for carrier demo mode dialog"