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

Change-Id: I15adc597039539d53e5c08dc5f8cac74bcb0eda2