Merge "Remove CaptivePortal deps on @hide MetricEvents" am: 465f25799c am: abbaff2736

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513141

Change-Id: I6b3b5127075289e885041ea4d09367e22fdebace
tree: f0c8c606dd762f63a9cfd80d82f80562ed0bbfe0
  1. core/
  2. services/
  3. tests/