Merge "Remove CaptivePortal deps on @hide MetricEvents"
tree: f0c8c606dd762f63a9cfd80d82f80562ed0bbfe0
  1. core/
  2. services/
  3. tests/