Merge "Add SystemApi for captive portal metrics"
am: b591097458

Change-Id: I1d1406a10c33034cf379ea7735cb106d3c536c8e
tree: 2cf5b870f5b71af99977842daac78824a94156ee
  1. core/
  2. services/
  3. tests/