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

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

Change-Id: Ic0f0be93d4610f47c80efb90fdd68858d70d0be8