Merge "Remove CaptivePortal deps on @hide MetricEvents" am: 8a157aaeee

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

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