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

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

Change-Id: I6b3b5127075289e885041ea4d09367e22fdebace