Merge "Remove CaptivePortal deps on @hide MetricEvents"