Merge "Add SystemApi for captive portal metrics"
am: 55849979a5

Change-Id: I1d1406a10c33034cf379ea7735cb106d3c536c8e