Merge "Remove CaptivePortal deps on @hide MetricEvents" am: e8f300c360

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

Change-Id: I647b1cc3329c527d9afa507864700a521a0908be